- Rewritten DHT monitoring

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c9f3d1177f8ab56b6dbeece5afd6b3908b7830d1..27fa591047d6a421d588e52ffd4ada0d11b5ed8d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -568,9 +568,9 @@ AC_ARG_WITH(microhttpd,
          AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
             AC_CHECK_LIB([microhttpd], [MHD_start_daemon],
               lmhd=1),
-           [],[#include "src/include/platform.h"
+           [],[#include "$srcdir/src/include/platform.h"
                 #include <microhttpd.h>]),,
-            [#include "src/include/platform.h"])
+            [#include "$srcdir/src/include/platform.h"])
         ;;
       *)
         LDFLAGS="-L$with_microhttpd/lib $LDFLAGS"
@@ -580,9 +580,9 @@ AC_ARG_WITH(microhttpd,
             AC_CHECK_LIB([microhttpd], [MHD_start_daemon],
               EXT_LIB_PATH="-L$with_microhttpd/lib $EXT_LIB_PATH"
               lmhd=1),
-           [],[#include "src/include/platform.h"
+           [],[#include "$srcdir/src/include/platform.h"
                 #include <microhttpd.h>]),,
-            [#include "src/include/platform.h"])
+            [#include "$srcdir/src/include/platform.h"])
         ;;
     esac
    ],
@@ -591,9 +591,9 @@ AC_ARG_WITH(microhttpd,
       AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
         AC_CHECK_LIB([microhttpd], [MHD_start_daemon],
           lmhd=1),
-       [],[#include "src/include/platform.h"
+       [],[#include "$srcdir/src/include/platform.h"
             #include <microhttpd.h>]),,
-       [#include "src/include/platform.h"])])
+       [#include "$srcdir/src/include/platform.h"])])
 AM_CONDITIONAL(HAVE_MHD, test x$lmhd = x1)
 AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd])
 
@@ -775,6 +775,24 @@ AC_ARG_ENABLE([testruns],
 AC_MSG_RESULT($enable_test_run)
 AM_CONDITIONAL([ENABLE_TEST_RUN], [test "x$enable_tests_run" = "xyes"])
 
+
+# should monkey be used when running (certain) services?
+AC_MSG_CHECKING(whether to run with monkey)
+AC_ARG_ENABLE([monkey],
+   [AS_HELP_STRING([--enable-monkey], [enable running with monkey])],
+   [enable_monkey=${enableval}],
+   [enable_monkey=no])
+AC_MSG_RESULT($enable_monkey)
+AM_CONDITIONAL([ENABLE_MONKEY], [test "x$enable_monkey" = "xyes"])
+if test "x$enable_monkey" = "xyes"
+then
+  MONKEYPREFIX="monkey"
+else
+  MONKEYPREFIX=""
+fi
+AC_SUBST(MONKEYPREFIX)
+
+
 # should expensive tests be run?
 AC_MSG_CHECKING(whether to run expensive tests)
 AC_ARG_ENABLE([expensivetests],
@@ -896,7 +914,9 @@ src/nse/nse.conf
 src/peerinfo/Makefile
 src/peerinfo/peerinfo.conf
 src/peerinfo-tool/Makefile
+src/postgres/Makefile
 src/pt/Makefile
+src/regex/Makefile
 src/statistics/Makefile
 src/statistics/statistics.conf
 src/stream/Makefile
@@ -926,6 +946,7 @@ pkgconfig/gnunethello.pc
 pkgconfig/gnunetnat.pc
 pkgconfig/gnunetnse.pc
 pkgconfig/gnunetpeerinfo.pc
+pkgconfig/gnunetregex.pc
 pkgconfig/gnunetstatistics.pc
 pkgconfig/gnunettesting.pc
 pkgconfig/gnunettransport.pc