X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=30edf62856bca983da4d0ecf6a3833e3974f6999;hb=e98bb339cbe55a6addc5dfb6a6a1cdbd0c27bb00;hp=e77a20b6b523618ede4de92671e5d88de2bd10e0;hpb=0c2fb87f1925718dda73b00659777c7ed7dbc185;p=oweals%2Fgnunet.git

diff --git a/configure.ac b/configure.ac
index e77a20b6b..30edf6285 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # This file is part of GNUnet.
-# (C) 2001--2014 Christian Grothoff (and other contributing authors)
+# (C) 2001--2015 Christian Grothoff (and other contributing authors)
 #
 # GNUnet is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published
@@ -202,6 +202,10 @@ AC_CHECK_LIB(socket, socket)
 AC_CHECK_LIB(m, log)
 AC_CHECK_LIB(c, getloadavg, AC_DEFINE(HAVE_GETLOADAVG,1,[getloadavg supported]))
 
+AC_CHECK_PROG(VAR_GETOPT_BINARY, getopt, true, false)
+AM_CONDITIONAL(HAVE_GETOPT_BINARY, $VAR_GETOPT_BINARY)
+
+
 
 AC_CHECK_MEMBER(struct tm.tm_gmtoff,
   [AC_DEFINE(HAVE_TM_GMTOFF, 1,
@@ -471,12 +475,15 @@ then
  # need libcurl-gnutls.so, everything else is not acceptable
  AC_CHECK_LIB([curl-gnutls],[curl_easy_getinfo],,[curl=false])
  # cURL must support CURLINFO_TLS_SESSION, version >= 7.34
- 
+
 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])
@@ -824,7 +831,7 @@ AC_ARG_WITH(microhttpd,
       yes)
         AC_CHECK_HEADERS([microhttpd.h],
 	  AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
-            AC_CHECK_LIB([microhttpd], [MHD_start_daemon],
+            AC_CHECK_LIB([microhttpd], [MHD_get_fdset2],
               [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.32])
               AC_RUN_IFELSE([AC_LANG_SOURCE([
                 #include "$native_srcdir/src/include/platform.h"
@@ -832,7 +839,7 @@ AC_ARG_WITH(microhttpd,
                 int main () { return MHD_VERSION >= 0x0093200 ? 0 : 1; }
                ])], [
                AC_MSG_RESULT(ok)
-               lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]),
+               lmhd=1],[AC_MSG_RESULT(failed)],lmhd=0)]),
 	    [],[#include "$native_srcdir/src/include/platform.h"
                 #include <microhttpd.h>]),,
             [#include "$native_srcdir/src/include/platform.h"])
@@ -842,7 +849,7 @@ AC_ARG_WITH(microhttpd,
         CPPFLAGS="-I$with_microhttpd/include $CPPFLAGS"
         AC_CHECK_HEADERS(microhttpd.h,
 	  AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
-            AC_CHECK_LIB([microhttpd], [MHD_start_daemon],
+            AC_CHECK_LIB([microhttpd], [MHD_get_fdset2],
               EXT_LIB_PATH="-L$with_microhttpd/lib $EXT_LIB_PATH"
               [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.32])
                AC_RUN_IFELSE([AC_LANG_SOURCE([
@@ -851,7 +858,7 @@ AC_ARG_WITH(microhttpd,
                 int main () { return MHD_VERSION >= 0x0093200 ? 0 : 1; }
                ])], [
                AC_MSG_RESULT(ok)
-               lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]),
+               lmhd=1],[AC_MSG_RESULT(failed)],lmhd=0)]),
 	    [],[#include "$native_srcdir/src/include/platform.h"
                 #include <microhttpd.h>]),,
             [#include "$native_srcdir/src/include/platform.h"])
@@ -861,7 +868,7 @@ AC_ARG_WITH(microhttpd,
    [AC_MSG_RESULT([--with-microhttpd not specified])
     AC_CHECK_HEADERS([microhttpd.h],
       AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
-        AC_CHECK_LIB([microhttpd], [MHD_start_daemon],
+        AC_CHECK_LIB([microhttpd], [MHD_get_fdset2],
           [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.32])
               AC_RUN_IFELSE([AC_LANG_SOURCE([
                 #include "$native_srcdir/src/include/platform.h"
@@ -869,7 +876,7 @@ AC_ARG_WITH(microhttpd,
                 int main () { return MHD_VERSION >= 0x0093200 ? 0 : 1; }
                ])], [
                AC_MSG_RESULT(ok)
-               lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]),
+               lmhd=1],[AC_MSG_RESULT(failed)],lmhd=0)]),
 	[],[#include "$native_srcdir/src/include/platform.h"
             #include <microhttpd.h>]),,
        [#include "$native_srcdir/src/include/platform.h"])])
@@ -1079,12 +1086,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])
 
@@ -1205,6 +1211,24 @@ AC_ARG_ENABLE([experimental],
 AC_MSG_RESULT($enable_experimental)
 AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"])
 
+# FTBFS right now...
+AC_MSG_CHECKING(whether to compile ATS test code)
+AC_ARG_ENABLE([wachs],
+   [AS_HELP_STRING([--enable-wachs], [enable compiling ATS test code])],
+   [enable_wachs=${enableval}],
+   [enable_wachs=no])
+AC_MSG_RESULT($enable_wachs)
+AM_CONDITIONAL([HAVE_WACHS], [test "x$enable_wachs" = "xyes"])
+
+# REST API
+AC_MSG_CHECKING(whether to compile REST API)
+AC_ARG_ENABLE([rest],
+   [AS_HELP_STRING([--enable-rest], [enable REST])],
+   [enable_rest=${enableval}],
+   [enable_rest=no])
+AC_MSG_RESULT($enable_rest)
+AM_CONDITIONAL([HAVE_REST], [test "x$enable_rest" = "xyes"])
+
 # should malicious code be compiled (should only be used for testing)?
 AC_MSG_CHECKING(whether to compile malicious code)
 AC_ARG_ENABLE([malicious],
@@ -1224,7 +1248,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 +1467,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
@@ -1483,6 +1505,8 @@ src/regex/Makefile
 src/regex/regex.conf
 src/revocation/Makefile
 src/revocation/revocation.conf
+src/rps/Makefile
+src/rps/rps.conf
 src/secretsharing/Makefile
 src/secretsharing/secretsharing.conf
 src/sensor/Makefile
@@ -1509,6 +1533,7 @@ src/util/Makefile
 src/util/resolver.conf
 src/vpn/Makefile
 src/vpn/vpn.conf
+src/rest/Makefile
 pkgconfig/Makefile
 pkgconfig/gnunetarm.pc
 pkgconfig/gnunetats.pc
@@ -1542,6 +1567,7 @@ pkgconfig/gnunetpsyc.pc
 pkgconfig/gnunetpsycstore.pc
 pkgconfig/gnunetregex.pc
 pkgconfig/gnunetrevocation.pc
+pkgconfig/gnunetrps.pc
 pkgconfig/gnunetscalarproduct.pc
 pkgconfig/gnunetset.pc
 pkgconfig/gnunetsocial.pc