-corrected type

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9bfbd31c3116913bfb26090b6c7b593d9071ed7d..30edf62856bca983da4d0ecf6a3833e3974f6999 100644 (file)
--- 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,
@@ -476,7 +480,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 +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],
@@ -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
@@ -1511,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