- sending act malicious message

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9c0bdc1b1cf5591da35168acafa1db08c395224b..8374c5c7e46d9a11bcb66a5f84bb5831ab526677 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -476,7 +476,10 @@ fi
 if test x$curl = xfalse
 then
        AM_CONDITIONAL(HAVE_LIBCURL, false)
+if test "$gnurl" = 0
+then
        AC_MSG_WARN([GNUnet requires libcurl-gnutls  >= 7.34])
+fi
 else
        AM_CONDITIONAL(HAVE_LIBCURL, true)
        AC_DEFINE([HAVE_LIBCURL],[1],[Have CURL])
@@ -1079,12 +1082,11 @@ AC_ARG_WITH(gnutls,
         AC_CHECK_LIB([gnutls], [gnutls_priority_set],
           gnutls=true))
     AC_CHECK_HEADERS([gnutls/dane.h],
-    AC_CHECK_LIB([gnutls-dane], [dane_verify_crt_raw],
-            gnutls_dane=1))
+        AC_CHECK_LIB([gnutls-dane], [dane_verify_crt_raw],
+                    gnutls_dane=1))
    ])
 AM_CONDITIONAL(HAVE_GNUTLS, test x$gnutls = xtrue)
 AC_DEFINE_UNQUOTED([HAVE_GNUTLS], $gnutls, [We have GnuTLS])
-
 AM_CONDITIONAL(HAVE_GNUTLS_DANE, test x$gnutls_dane = x1)
 AC_DEFINE_UNQUOTED([HAVE_GNUTLS_DANE], $gnutls_dane, [We have GnuTLS with DANE support])
 
@@ -1224,7 +1226,7 @@ AC_DEFINE_UNQUOTED([ENABLE_MALICIOUS], [$malicious],
 
 # should services be started by default when a peer starts?  Some services may
 # choose to never start by default and it is upto the service/module developer to
-# decide it by having "AUTOSTART = NO" instead of "AUTOSTART = @AUTOSTART" in
+# decide it by having "AUTOSTART = NO" instead of "AUTOSTART = @AUTOSTART@" in
 # the service/module's conf.in file.
 AUTOSTART="YES"
 AC_MSG_CHECKING(whether to auto-start peer's services by default)
@@ -1443,8 +1445,6 @@ src/dv/Makefile
 src/dv/dv.conf
 src/env/Makefile
 src/exit/Makefile
-src/experimentation/Makefile
-src/experimentation/experimentation.conf
 src/fragmentation/Makefile
 src/fs/Makefile
 src/fs/fs.conf