Merge remote-tracking branch 'origin/master' into credentials
[oweals/gnunet.git] / configure.ac
index 9400835d014c733bf5bd59ccf77fad590f121976..8a2ab926276d7baab87a8802dc3d004bf185013e 100644 (file)
@@ -1,9 +1,9 @@
 # This file is part of GNUnet.
-# (C) 2001--2013 Christian Grothoff (and other contributing authors)
+# (C) 2001--2017 GNUnet e.V.
 #
 # GNUnet is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published
-# by the Free Software Foundation; either version 2, or (at your
+# by the Free Software Foundation; either version 3, or (at your
 # option) any later version.
 #
 # GNUnet is distributed in the hope that it will be useful, but
@@ -13,8 +13,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GNUnet; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 #
 #
 # Process this file with autoconf to produce a configure script.
@@ -22,7 +22,7 @@
 #
 AC_PREREQ(2.61)
 # Checks for programs.
-AC_INIT([gnunet], [0.9.5a], [bug-gnunet@gnu.org])
+AC_INIT([gnunet], [0.10.1], [bug-gnunet@gnu.org])
 
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -32,9 +32,9 @@ AM_INIT_AUTOMAKE
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_HEADERS([gnunet_config.h])
 AH_TOP([#define _GNU_SOURCE  1])
-
+AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_AWK
-AC_PROG_CC
+AC_PROG_CC_C99
 AC_PROG_CPP
 AC_PROG_CXX
 AC_PROG_OBJC
@@ -50,11 +50,6 @@ AC_SYS_LARGEFILE
 AC_FUNC_FSEEKO
 
 
-if test "$enable_shared" = "no"
-then
- AC_MSG_ERROR([GNUnet only works with shared libraries. Sorry.])
-fi
-
 CFLAGS="-Wall $CFLAGS"
 # use '-fno-strict-aliasing', but only if the compiler can take it
 if gcc -fno-strict-aliasing -S -o /dev/null -xc /dev/null >/dev/null 2>&1;
@@ -75,8 +70,8 @@ case "$host_os" in
 *darwin* | *rhapsody* | *macosx*)
      AC_DEFINE_UNQUOTED(DARWIN,1,[This is an Apple Darwin system])
      CPPFLAGS="-D_APPLE_C_SOURCE $CPPFLAGS"
-     CFLAGS="-no-cpp-precomp -fno-common $CFLAGS"
-     AC_MSG_WARN([The VPN application cannot be compiled on your OS])
+     CFLAGS="-fno-common $CFLAGS"
+     AC_MSG_WARN([WARNING: The VPN application cannot be compiled on your OS])
      build_target="darwin"
      DEFAULT_INTERFACE="\"en0\""
      LIBPREFIX=
@@ -138,7 +133,6 @@ linux*)
      AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system])
      AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system])
      AC_CHECK_LIB(intl, gettext)
-     LDFLAGS="$LDFLAGS -no-undefined"
      CFLAGS="-mms-bitfields $CFLAGS"
      build_target="cygwin"
      LIBPREFIX=lib
@@ -151,7 +145,7 @@ linux*)
      AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system])
      AC_DEFINE_UNQUOTED(_WIN32,1,[This is a Windows system])
      AC_CHECK_LIB(intl, gettext)
-     LDFLAGS="$LDFLAGS -Wl,-no-undefined -Wl,--export-all-symbols"
+     LDFLAGS="$LDFLAGS -Wl,--export-all-symbols"
      LIBS="$LIBS -lws2_32 -lplibc -lgnurx -lole32"
      CFLAGS="-mms-bitfields $CFLAGS"
      CPPFLAGS="-D_WIN32_WINNT=0x0501 -DHAVE_STAT64=1 -D__USE_MINGW_ANSI_STDIO=1 $CPPFLAGS"
@@ -203,17 +197,33 @@ 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_PROG(VAR_SSH_BINARY,ssh,true,false)
+AM_CONDITIONAL(HAVE_SSH_BINARY, $VAR_SSH_BINARY)
+AM_CONDITIONAL(HAVE_SSH_KEY,  ssh -D 12345 -o "BatchMode yes" -o "UserKnownHostsFile /tmp/gnunet_test_cosks_ssh_garbage" -o "StrictHostKeyChecking no" 127.0.0.1 echo -n)
+rm -f /tmp/gnunet_test_cosks_ssh_garbage
+
+
+AC_CHECK_MEMBER(struct tm.tm_gmtoff,
+  [AC_DEFINE(HAVE_TM_GMTOFF, 1,
+     [Define if struct tm has the tm_gmtoff member.])],
+     ,
+     [#include <time.h>])
+
+AC_CHECK_DECLS([_stati64])
+
 # 'save' libs; only those libs found so far will be
 # linked against _everywhere_.  For the others, we
 # will be more selective!
 SAVE_LIBS=$LIBS
 
-# libgnurx (regex library for W32)
-gnurx=0
-AC_CHECK_LIB(gnurx, regexec, gnurx=1)
-if test "x$gnurx" = "x0" -a "x$build_target" = "xmingw"
+# tests only run on Windows
+if test "x$build_target" = "xmingw"
 then
-  AC_MSG_ERROR([on W32 GNUnet needs libgnurx])
+  AC_CHECK_LIB(plibc, plibc_init, [], [AC_MSG_ERROR([GNUnet requires PlibC on Windows])])
+  AC_CHECK_LIB(gnurx, regexec, [], [AC_MSG_ERROR([GNUnet requires libgnurx on Windows])])
 fi
 
 # libgcrypt
@@ -223,7 +233,7 @@ NEED_LIBGCRYPT_VERSION=1.6.0
 
 
 AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION", gcrypt=1)
-AC_CHECK_DECLS([gcry_mpi_lshift], [], [], [[#include <gcrypt.h>]])
+AC_CHECK_DECLS([gcry_mpi_set_opaque_copy], [], [], [[#include <gcrypt.h>]])
 
 if test $gcrypt = 0
 then
@@ -232,7 +242,7 @@ then
 *** You need libgcrypt to build this program.
 **  This library is for example available at
 ***   ftp://ftp.gnupg.org/gcrypt/libgcrypt/
-*** (at least version $NEED_LIBGCRYPT_VERSION (API $NEED_LIBGCRYPT_API) 
+*** (at least version $NEED_LIBGCRYPT_VERSION (API $NEED_LIBGCRYPT_API)
 ***  is required.)
 ***]])
 fi
@@ -243,7 +253,7 @@ AC_DEFINE_UNQUOTED([NEED_LIBGCRYPT_VERSION], "$NEED_LIBGCRYPT_VERSION", [require
 AC_ARG_ENABLE(gcc-hardening,
    AS_HELP_STRING(--enable-gcc-hardening, enable compiler security checks),
 [if test x$enableval = xyes; then
-    CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fstack-protector-all"
+    CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-all"
     CFLAGS="$CFLAGS -fwrapv -fPIE -Wstack-protector"
     CFLAGS="$CFLAGS --param ssp-buffer-size=1"
     LDFLAGS="$LDFLAGS -pie"
@@ -259,6 +269,13 @@ AC_ARG_ENABLE(linker-hardening,
 fi])
 
 
+AC_ARG_ENABLE(sanitizer,
+  AS_HELP_STRING(--enable-sanitizer, enable Address Sanitizer and Undefined Behavior Sanitizer),
+[if test x$enableval = xyes; then
+   LDFLAGS="$CFLAGS -fsanitize=address,undefined -fno-omit-frame-pointer"
+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)]),
@@ -296,10 +313,10 @@ AC_LANG_PUSH(C)
 LIBS="$LIBS $LIBGCRYPT_LIBS"
 CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS"
 AC_RUN_IFELSE(
-  [AC_LANG_PROGRAM([#include <gcrypt.h> 
+  [AC_LANG_PROGRAM([#include <gcrypt.h>
        #include <stdio.h>], [[
         gcry_md_hd_t mac;
-      
+
         unsigned char data[] = { 0xbf, 0x16, 0x6e, 0x46, 0x3a, 0x6c, 0xf3, 0x93, 0xa7, 0x72,
             0x11, 0xa1, 0xdc, 0x0b, 0x07, 0xdb, 0x1a, 0x5e, 0xd9, 0xb9, 0x81, 0xbe,
             0xea, 0xe4, 0x31, 0x5f, 0x24, 0xff, 0xfe, 0x50, 0x8a, 0xde };
@@ -310,33 +327,33 @@ AC_RUN_IFELSE(
             0xd, 0xba, 0x17, 0x7d, 0xd3, 0x10, 0xb1, 0x37, 0x41, 0x91, 0x7d, 0xeb,
             0x1, 0x4d, 0x71, 0xe8, 0x59, 0x71, 0x42, 0x8e, 0xd6, 0xf3, 0x29, 0x3b,
             0x90, 0xf2, 0xd1, 0xaf, 0x65, 0x1e, 0xb3};
-      
+
         if (!gcry_check_version (GCRYPT_VERSION))
         {
           fprintf (stderr, "Version mismatch %s <-> %s \n", gcry_check_version (NULL), GCRYPT_VERSION);
           return 1;
         }
-  
+
         gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
         gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
-  
+
         if (gcry_md_open(&mac, GCRY_MD_SHA512, GCRY_MD_FLAG_HMAC) != GPG_ERR_NO_ERROR)
         {
           fprintf (stderr, "gcry_md_open error\n");
           return 2;
         }
-  
+
         gcry_md_setkey (mac, key, sizeof (key));
         gcry_md_write (mac, data, sizeof (data));
-  
+
         if (memcmp(gcry_md_read (mac, 0), result, gcry_md_get_algo_dlen (gcry_md_get_algo (mac))) != 0)
         {
           fprintf (stderr, "memcmp error\n");
           return 3;
         }
-  
+
         gcry_md_close (mac);
-  
+
         return 0;
     ]])],
   [AC_MSG_RESULT([yes])],
@@ -354,108 +371,189 @@ AC_RUN_IFELSE(
    then
      AC_MSG_FAILURE([libgcrypt header version does not match library version])
    fi
-  ])
+  ],
+  [AC_MSG_RESULT([cross compiling, test skipped])])
 AC_LANG_POP(C)
 fi     # $build = $target
 
 # check for bluetooth library
 bluetooth=0
 AC_CHECK_LIB(bluetooth, ba2str,[AC_CHECK_HEADER([bluetooth/bluetooth.h],bluetooth=1)])
+if test "$build_target" = "mingw"
+then
+  bluetooth=1
+fi
+AM_CONDITIONAL(HAVE_LIBBLUETOOTH, [test "$bluetooth" = 1])
 if test "$bluetooth" = 1
 then
-  AM_CONDITIONAL(HAVE_LIBBLUETOOTH, true)
   AC_DEFINE([HAVE_LIBBLUETOOTH],[1],[Have bluetooth library])
 else
-  AM_CONDITIONAL(HAVE_LIBBLUETOOTH, false)
+  AC_DEFINE([HAVE_LIBBLUETOOTH],[0],[Lacking bluetooth library])
 fi
-if test "$build_target" = "mingw"
+
+# check for jansson library
+jansson=0
+AC_CHECK_HEADER([jansson.h],jansson=1)
+AM_CONDITIONAL(HAVE_JANSSON, [test "$jansson" = 1])
+if test "x$jansson" = x1
 then
-  bluetooth=1
+  AC_DEFINE([HAVE_JANSSON],[1],[Have jansson library])
+else
+  AC_DEFINE([HAVE_JANSSON],[0],[Lacking jansson library])
 fi
 
 # check for libpulse(audio) library
 pulse=0
 AC_CHECK_LIB(pulse,pa_stream_peek,
   [AC_CHECK_HEADER([pulse/simple.h],pulse=1)])
-if test "$pulse" = 1
-then
-  AM_CONDITIONAL(HAVE_PULSE, true)
-  AC_DEFINE([HAVE_PULSE],[1],[Have libpulse(audio) library])
-else
-  AM_CONDITIONAL(HAVE_PULSE, false)
-fi
 if test "$build_target" = "mingw"
 then
   pulse=0
 fi
+if test "$pulse" = 1
+then
+  AC_DEFINE([HAVE_PULSE],[1],[Have libpulse(audio) library])
+fi
 
 # check for libopus(audio) library
 opus=0
 AC_CHECK_LIB(opus,opus_decode_float,
-  [AC_CHECK_HEADER([opus/opus.h],opus=1)])
+  [AC_CHECK_HEADER([opus/opus.h],
+    [AC_CHECK_DECL([OPUS_SET_GAIN],[opus=1],[],[[#include <opus/opus.h>]]
+    )]
+  )]
+)
 if test "$opus" = 1
 then
-  AM_CONDITIONAL(HAVE_OPUS, true)
   AC_DEFINE([HAVE_OPUS],[1],[Have libopus library])
-else
-  AM_CONDITIONAL(HAVE_OPUS, false)
 fi
 
+# libogg
+AC_CHECK_LIB(ogg, ogg_stream_flush_fill,
+        [AC_CHECK_HEADERS([ogg/ogg.h],
+          AM_CONDITIONAL(HAVE_OGG, true)
+          ogg=1
+          AC_DEFINE(HAVE_OGG,1,[Have ogg]),
+          AM_CONDITIONAL(HAVE_OGG, false)
+          ogg=0
+          AC_DEFINE(HAVE_OGG,0,[lacking ogg]))],
+        AM_CONDITIONAL(HAVE_OGG, false)
+        ogg=0)
+
+
 
-# libcurl
-LIBCURL_CHECK_CONFIG(,7.21.3,curl=1,curl=0)
-if test "$curl" = 1
+gst=0
+PKG_CHECK_MODULES(
+  [GST],
+  [glib-2.0 gobject-2.0 gstreamer-1.0 gstreamer-app-1.0 gstreamer-audio-1.0],
+  [
+    gst=1
+    AC_MSG_RESULT(ok)
+  ], [
+    gst=0
+    AC_MSG_RESULT(not found)
+  ])
+
+# Pulse Audio
+if test "x$pulse" != "x1" -o "x$opus" != "x1" -o "x$ogg" != "x1"
 then
-       AM_CONDITIONAL(HAVE_LIBCURL, true)
-       AC_DEFINE([HAVE_LIBCURL],[1],[Have libcurl])
+ if test "x$gst" != "x1"
+ then
+  conversation_backend=none
+  AM_CONDITIONAL(BUILD_PULSE_HELPERS, false)
+  AM_CONDITIONAL(BUILD_GST_HELPERS, false)
+  AM_CONDITIONAL(BUILD_EXPERIMENTAL_HELPERS, false)
+ else
+   conversation_backend=gst
+   AM_CONDITIONAL(BUILD_PULSE_HELPERS, false)
+   AM_CONDITIONAL(BUILD_GST_HELPERS, true)
+   AM_CONDITIONAL(BUILD_EXPERIMENTAL_HELPERS, false)
+ fi
 else
-       AM_CONDITIONAL(HAVE_LIBCURL, false)
+
+ conversation_backend=pulse
+ AM_CONDITIONAL(BUILD_PULSE_HELPERS, true)
+ AM_CONDITIONAL(BUILD_GST_HELPERS, false)
+ AM_CONDITIONAL(BUILD_EXPERIMENTAL_HELPERS, false)
 fi
 
+# libgnurl
+LIBGNURL_CHECK_CONFIG(,7.34.0,gnurl=1,gnurl=0)
+if test "$gnurl" = 1
+then
+       AM_CONDITIONAL(HAVE_LIBGNURL, true)
+       AC_DEFINE([HAVE_LIBGNURL],[1],[Have libgnurl])
+else
+       AM_CONDITIONAL(HAVE_LIBGNURL, false)
+       AC_DEFINE([HAVE_LIBGNURL],[0],[Lacking libgnurl])
+fi
 
-# libidn
-AC_MSG_CHECKING([if Libidn can be used])
-AC_ARG_WITH(libidn, AC_HELP_STRING([--with-libidn=[DIR]],
-                                    [Support IDN (needs GNU Libidn)]),
-libidn=$withval, libidn=yes)
-if test "$libidn" != "no"; then
-  if test "$libidn" != "yes"; then
-     LDFLAGS="${LDFLAGS} -L$libidn/lib"
-     CPPFLAGS="${CPPFLAGS} -I$libidn/include"
-  fi
-  AC_CHECK_HEADER(idna.h,
-    AC_CHECK_LIB(idn, stringprep_check_version,
-      [libidn=yes LIBS="${LIBS} -lidn"], 
-      AC_MSG_FAILURE([GNUnet requires libidn])),
-    AC_MSG_FAILURE([GNUnet requires libidn]))
+SAVE_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$LIBGNURL_CPPFLAGS $LIBCURL_CPPFLAGS $CPPFLAGS"
+LIBS="$LIBGNURL $LIBCURL $LIBS"
+
+# libcurl-gnutls
+LIBCURL_CHECK_CONFIG(,7.34.0,[curl=true],[curl=false])
+if test "x$curl" = xtrue
+then
+
+ AC_CHECK_HEADERS([curl/curl.h],
+  AC_CHECK_DECLS(CURLINFO_TLS_SESSION,[curl=true],[curl=false],[[#include <curl/curl.h>]]),
+  [curl=false])
+ AC_CHECK_HEADERS([gnurl/curl.h],
+  AC_CHECK_DECLS(CURLINFO_TLS_SESSION,[curl=true],,[[#include <gnurl/curl.h>]]))
+ # 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
-AC_MSG_RESULT($libidn)
 
-# restore LIBS
-LIBS=$SAVE_LIBS
+# Check for curl/curl.h and gnurl/curl.h so we can use #ifdef
+# HAVE_CURL_CURL_H later (the above LIBCURL_CHECK_CONFIG accepted
+# *either* header set).
+AC_CHECK_HEADERS([curl/curl.h],,
+  curl=false
+  AC_CHECK_HEADERS([gnurl/curl.h],,
+  gnurl=false))
+
+
+
+if test x$curl = xfalse
+then
+       AM_CONDITIONAL(HAVE_LIBCURL, false)
+if test "$gnurl" = 0
+then
+       AC_MSG_WARN([ERROR: GNUnet requires libcurl-gnutls or gnurl >= 7.34])
+fi
+else
+       AM_CONDITIONAL(HAVE_LIBCURL, true)
+       AC_DEFINE([HAVE_LIBCURL],[1],[Have CURL])
+fi
 
 
+# restore LIBS & CPPFLAGS
+LIBS=$SAVE_LIBS
+CPPFLAGS=$SAVE_CPPFLAGS
+
 AC_CHECK_HEADERS([glpk.h],[glpk=true],[gplk=false])
 # GLPK must support glpk_init_env, version >= 4.43
-AC_CHECK_LIB([glpk],[glp_init_env],,[gplk=false]) 
+AC_CHECK_LIB([glpk],[glp_init_env],,[gplk=false])
 # GLPK must support atm MLP presolving, version >= 4.32
 AC_CHECK_MEMBERS(glp_iocp.presolve,,[gplk=false],[[#include <glpk.h>]])
 if test x$gplk = xfalse
 then
        AM_CONDITIONAL(HAVE_LIBGLPK, false)
-       AC_MSG_WARN([GNUnet requires GLPK  >= 4.32])
+       AC_MSG_WARN([ERROR: GNUnet requires GLPK  >= 4.32])
 else
        AM_CONDITIONAL(HAVE_LIBGLPK, true)
        AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK])
 fi
 
 
-
 AC_CHECK_HEADERS([nss.h],[nss=true],[nss=false])
 if test x$nss = xfalse
 then
        AM_CONDITIONAL(HAVE_GLIBCNSS, false)
-       AC_MSG_WARN([No GNU libc nss header, will not build NSS plugin])
+       AC_MSG_WARN([ERROR: No GNU libc nss header, will not build NSS plugin])
 else
        AM_CONDITIONAL(HAVE_GLIBCNSS, true)
 fi
@@ -466,6 +564,24 @@ fi
 AC_CHECK_LIB([kvm],[kvm_open])
 AC_CHECK_LIB([kstat],[kstat_open])
 
+
+# should the build process be restricted to the code required
+# for GNU Taler wallets?
+AC_MSG_CHECKING(whether to compile GNU Taler Wallet library ONLY)
+AC_ARG_ENABLE([taler-wallet],
+   [AS_HELP_STRING([--enable-taler-wallet], [only compile for Taler wallet])],
+   [taler_only=${enableval}],
+   [taler_only=no])
+AC_MSG_RESULT($taler_only)
+if test "x$taler_only" = "xyes"
+then
+  AM_CONDITIONAL([TALER_ONLY],true)
+  AC_DEFINE([TALER_WALLET_ONLY],[1],[Compiling for Taler wallet])
+else
+  AM_CONDITIONAL([TALER_ONLY],false)
+  AC_DEFINE([TALER_WALLET_ONLY],[0],[Canonical compilation])
+fi
+
 # test for libextractor
 extractor=0
 AC_MSG_CHECKING(for libextractor)
@@ -494,12 +610,21 @@ AC_ARG_WITH(extractor,
     AC_CHECK_HEADERS(extractor.h,
      AC_CHECK_LIB([extractor], [EXTRACTOR_plugin_add_defaults],
       extractor=1))])
+# restore LIBS
+LIBS=$SAVE_LIBS
+
 if test "$extractor" != 1
 then
- AC_MSG_ERROR([GNUnet requires libextractor])
+ AM_CONDITIONAL(HAVE_LIBEXTRACTOR, false)
+ AC_DEFINE([HAVE_LIBEXTRACTOR],[0],[Lacking libextractor])
+else
+ AM_CONDITIONAL(HAVE_LIBEXTRACTOR, true)
+ AC_DEFINE([HAVE_LIBEXTRACTOR],[1],[Have libextractor])
 fi
-# restore LIBS
-LIBS=$SAVE_LIBS
+
+
+if test "$taler_only" != yes
+then
 
 # Check for libltdl header (#2999)
 ltdl=0
@@ -538,14 +663,88 @@ fi
 # restore LIBS
 LIBS=$SAVE_LIBS
 
+
+# libidn
+AC_MSG_CHECKING([if Libidn can be used])
+AC_ARG_WITH(libidn, AC_HELP_STRING([--with-libidn=[DIR]],
+                                    [Support IDN (needs GNU Libidn)]),
+libidn=$withval, libidn=yes)
+if test "$libidn" != "no"; then
+  if test "$libidn" != "yes"; then
+     LDFLAGS="${LDFLAGS} -L$libidn/lib"
+     CPPFLAGS="${CPPFLAGS} -I$libidn/include"
+  fi
+fi
+libidn=no
+AC_CHECK_HEADER(idna.h,
+  AC_CHECK_LIB(idn, stringprep_check_version,
+    [libidn=yes LIBS="${LIBS} -lidn"], []), [])
+if test "$libidn" != "yes"; then
+  AC_MSG_FAILURE([GNUnet requires libidn.
+libidn-1.13 should be sufficient, newer versions work too.])
+fi
+AC_MSG_RESULT($libidn)
+
+
+# test for zlib
+SAVE_LDFLAGS=$LDFLAGS
+SAVE_CPPFLAGS=$CPPFLAGS
+AC_ARG_WITH(zlib,
+           [  --with-zlib[[=DIR]]       use libz in DIR],
+           [AS_IF([test "$withval" = "no"],
+                  [AC_MSG_ERROR([GNUnet requires zlib])],
+                  [test "$withval" != "yes"],
+                  [
+                    Z_DIR=$withval
+                    CPPFLAGS="${CPPFLAGS} -I$withval/include"
+                    LDFLAGS="${LDFLAGS} -L$withval/lib"
+                  ])
+           ])
+AC_CHECK_HEADER(zlib.h,
+               [],
+               [AC_MSG_ERROR([GNUnet requires zlib])])
+AC_CHECK_LIB(z, compress2,
+            [
+             AC_DEFINE([HAVE_ZLIB], [], [Have compression library])
+             if test "x${Z_DIR}" != "x"; then
+                     Z_CFLAGS="-I${Z_DIR}/include"
+                     Z_LIBS="-L${Z_DIR}/lib -lz"
+             else
+                     Z_LIBS="-lz"
+             fi],
+             [AC_MSG_ERROR([GNUnet requires zlib])])
+AC_SUBST(Z_CFLAGS)
+AC_SUBST(Z_LIBS)
+
+if test "$enable_shared" = "no"
+then
+ AC_MSG_ERROR([GNUnet only works with shared libraries. Sorry.])
+fi
+
+
+
+# restore LIBS
+LIBS=$SAVE_LIBS
+
+
+fi
+
+# check for iconv
+AM_ICONV
+
 # test for libunistring
 gl_LIBUNISTRING
 if test $HAVE_LIBUNISTRING != yes; then
  AC_MSG_ERROR([GNUnet requires libunistring])
 fi
-if test $gl_libunistring_hexversion -le 2305; then
+# under emscripten, $gl_libunistring_hexversion is undefined
+if test "$taler_only" != yes; then
+if test "x$gl_libunistring_hexversion" = "x" || test "$gl_libunistring_hexversion" -le 2305; then
  AC_MSG_ERROR([GNUnet requires libunistring >= 0.9.1.1])
 fi
+fi
+AC_CHECK_HEADERS([unistr.h],,AC_MSG_ERROR([Compiling GNUnet requires unistr.h (from libunistring) to be installed]))
+
 # restore LIBS
 LIBS=$SAVE_LIBS
 
@@ -561,7 +760,20 @@ AC_CHECK_HEADERS([fcntl.h math.h errno.h ctype.h limits.h stdio.h stdlib.h strin
 
 
 # Checks for headers that are only required on some systems or opional (and where we do NOT abort if they are not there)
-AC_CHECK_HEADERS([malloc.h malloc/malloc.h langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/select.h sockLib.h sys/mman.h sys/msg.h sys/vfs.h arpa/inet.h fcntl.h libintl.h netdb.h netinet/in.h netinet/in_systm.h netinet/ip.h sys/ioctl.h sys/socket.h sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h sys/file.h sys/resource.h ifaddrs.h mach/mach.h stddef.h sys/timeb.h terminos.h argz.h ucred.h endian.h sys/endian.h execinfo.h])
+AC_CHECK_HEADERS([malloc.h malloc/malloc.h malloc/malloc_np.h langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/select.h sockLib.h sys/mman.h sys/msg.h sys/vfs.h arpa/inet.h fcntl.h libintl.h netdb.h netinet/in.h sys/ioctl.h sys/socket.h sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h sys/file.h sys/resource.h ifaddrs.h mach/mach.h stddef.h sys/timeb.h terminos.h argz.h ucred.h sys/ucred.h endian.h sys/endian.h execinfo.h byteswap.h])
+
+# FreeBSD requires something more funky for netinet/in_systm.h and netinet/ip.h...
+AC_CHECK_HEADERS([sys/types.h netinet/in_systm.h netinet/in.h netinet/ip.h],,,
+[#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_NETINET_IN_SYSTM_H
+#include <netinet/in_systm.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+])
 
 SAVE_LDFLAGS=$LDFLAGS
 SAVE_CPPFLAGS=$CPPFLAGS
@@ -598,67 +810,22 @@ AM_CONDITIONAL(HAVE_SQLITE, test x$sqlite = xtrue)
 AC_SUBST(SQLITE_CPPFLAGS)
 AC_SUBST(SQLITE_LDFLAGS)
 
+LDFLAGS=$SAVE_LDFLAGS
+CPPFLAGS=$SAVE_CPPFLAGS
+
 # test for postgres
 postgres=false
-AC_MSG_CHECKING(for postgres)
-AC_ARG_WITH(postgres,
-  [  --with-postgres=PFX       base of postgres installation],
-  [AC_MSG_RESULT("$with_postgres")
-   case $with_postgres in
-   no)
-     ;;
-   yes)
-    AC_CHECK_HEADERS(postgresql/libpq-fe.h,
-     postgres=true)
-     ;;
-   *)
-    LDFLAGS="-L$with_postgres/lib $LDFLAGS"
-    CPPFLAGS="-I$with_postgres/include $CPPFLAGS"
-    AC_CHECK_HEADERS(postgresql/libpq-fe.h,
-     EXT_LIB_PATH="-L$with_postgres/lib $EXT_LIB_PATH"
-     POSTGRES_LDFLAGS="-L$with_postgres/lib"
-     POSTGRES_CPPFLAGS="-I$with_postgres/include"
-     postgres=true)
-    LDFLAGS=$SAVE_LDFLAGS
-    CPPFLAGS=$SAVE_CPPFLAGS
-    ;;
-   esac
-  ],
-  [AC_MSG_RESULT([--with-postgres not specified])
-    AC_CHECK_HEADERS(postgresql/libpq-fe.h, postgres=true)])
-AM_CONDITIONAL(HAVE_POSTGRES, test x$postgres = xtrue)
-AC_SUBST(POSTGRES_CPPFLAGS)
-AC_SUBST(POSTGRES_LDFLAGS)
+# even running the check for postgres breaks emscripten ...
+if test "$taler_only" != yes; then
+  AX_LIB_POSTGRESQL([9.5])
+  if test "$found_postgresql" = "yes"; then
+    CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS"
+    AC_CHECK_HEADERS([libpq-fe.h],
+      postgres=true)
+  fi
+fi
+AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue)
 
-# test for zlib
-SAVE_LDFLAGS=$LDFLAGS
-SAVE_CPPFLAGS=$CPPFLAGS
-AC_ARG_WITH(zlib,
-           [  --with-zlib[[=DIR]]       use libz in DIR],
-           [AS_IF([test "$withval" = "no"],
-                  [AC_MSG_ERROR([GNUnet requires zlib])],
-                  [test "$withval" != "yes"],
-                  [
-                    Z_DIR=$withval
-                    CPPFLAGS="${CPPFLAGS} -I$withval/include"
-                    LDFLAGS="${LDFLAGS} -L$withval/lib"
-                  ])
-           ])
-AC_CHECK_HEADER(zlib.h,
-               [],
-               [AC_MSG_ERROR([GNUnet requires zlib])])
-AC_CHECK_LIB(z, compress2,
-            [
-             AC_DEFINE([HAVE_ZLIB], [], [Have compression library])
-             if test "x${Z_DIR}" != "x"; then
-                     Z_CFLAGS="-I${Z_DIR}/include"
-                     Z_LIBS="-L${Z_DIR}/lib -lz"
-             else
-                     Z_LIBS="-lz"
-             fi],
-             [AC_MSG_ERROR([GNUnet requires zlib])])
-AC_SUBST(Z_CFLAGS)
-AC_SUBST(Z_LIBS)
 
 LDFLAGS=$SAVE_LDFLAGS
 CPPFLAGS=$SAVE_CPPFLAGS
@@ -680,21 +847,27 @@ SAVE_CPPFLAGS=$CPPFLAGS
 AC_MSG_CHECKING(for mysql)
 AC_ARG_WITH(mysql,
   [  --with-mysql=PFX        base of MySQL installation],
-  [AC_MSG_RESULT("$with_mysql")
-   if test "$with_mysql" != "no"
-   then
-    if test "$with_mysql" != "yes"
-    then
+  [AC_MSG_RESULT([$with_mysql])
+   case $with_mysql in
+   no)
+      ;;
+   yes|"")
+      AC_CHECK_HEADERS(mysql/mysql.h,
+       AC_CHECK_LIB(mysqlclient, mysql_init,
+
+       mysql=true), [], [$CYGWIN_MYSQL_MAGIC])
+      ;;
+   *)
       LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql $LDFLAGS $ZLIBS"
       CPPFLAGS="-I$with_mysql/include $CPPFLAGS"
-    fi
-    AC_CHECK_HEADERS(mysql/mysql.h,
-     AC_CHECK_LIB(mysqlclient, mysql_init,
-      MYSQL_LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql"
-      MYSQL_CPPFLAGS="-I$with_mysql/include"
+      AC_CHECK_HEADERS(mysql/mysql.h,
+       AC_CHECK_LIB(mysqlclient, mysql_init,
+        MYSQL_LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql"
+        MYSQL_CPPFLAGS="-I$with_mysql/include"
 
-      mysql=true), [], [$CYGWIN_MYSQL_MAGIC])
-   fi
+        mysql=true), [], [$CYGWIN_MYSQL_MAGIC])
+      ;;
+   esac
   ],
   [AC_MSG_RESULT([--with-mysql not specified])
    if test -d "/usr/lib64/mysql"; then
@@ -721,13 +894,14 @@ AC_ARG_ENABLE(mysql-version-check, [  --disable-mysql-version-check  do not chec
 if test "$mysql" = "true" -a "x$enable_mysql_version_check" = "xyes"
 then
   AC_MSG_CHECKING(mysql version)
-  AC_RUN_IFELSE([AC_LANG_PROGRAM(
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
     [[$CYGWIN_MYSQL_MAGIC
       #include <mysql/mysql.h>]],
-    [[if (MYSQL_VERSION_ID < 40100)
-        return(-1);
-      else
-        return(0);
+    [[
+      #if (MYSQL_VERSION_ID < 40100)
+      #error needs at least version >= 4.1
+      #endif
+      int main () { return 0; }
     ]])
     ],mysql=true,mysql=false)
   if test "$mysql" = "false"
@@ -759,18 +933,22 @@ AC_ARG_WITH(microhttpd,
     case $with_microhttpd in
       no)
         ;;
-      yes)
+      yes|"")
         AC_CHECK_HEADERS([microhttpd.h],
          AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
-            AC_CHECK_LIB([microhttpd], [MHD_start_daemon],
-              [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.31])
-              AC_RUN_IFELSE([AC_LANG_SOURCE([
+            AC_CHECK_LIB([microhttpd], [MHD_get_fdset2],
+              [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.42])
+              AC_COMPILE_IFELSE([AC_LANG_SOURCE([
                 #include "$native_srcdir/src/include/platform.h"
                 #include <microhttpd.h>
-                int main () { return MHD_VERSION >= 0x0093002 ? 0 : 1; }
-               ])], [
-               AC_MSG_RESULT(ok)
-               lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]),
+                #if (MHD_VERSION < 0x0094200)
+                #error needs at least version 0.9.42
+                #endif
+                int main () { return 0; }
+               ])],
+               [AC_MSG_RESULT(ok)
+                lmhd=1],
+               [AC_MSG_RESULT(failed)])]),
            [],[#include "$native_srcdir/src/include/platform.h"
                 #include <microhttpd.h>]),,
             [#include "$native_srcdir/src/include/platform.h"])
@@ -780,16 +958,20 @@ 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.31])
-               AC_RUN_IFELSE([AC_LANG_SOURCE([
+              [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.42])
+               AC_COMPILE_IFELSE([AC_LANG_SOURCE([
                 #include "$native_srcdir/src/include/platform.h"
                 #include <microhttpd.h>
-                int main () { return MHD_VERSION >= 0x0093002 ? 0 : 1; }
-               ])], [
-               AC_MSG_RESULT(ok)
-               lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]),
+                #if (MHD_VERSION < 0x0094200)
+                #error needs at least version 0.9.42
+                #endif
+                int main () { return 0; }
+               ])],
+               [AC_MSG_RESULT(ok)
+                lmhd=1],
+               [AC_MSG_RESULT(failed)])]),
            [],[#include "$native_srcdir/src/include/platform.h"
                 #include <microhttpd.h>]),,
             [#include "$native_srcdir/src/include/platform.h"])
@@ -799,21 +981,25 @@ 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_MSG_CHECKING([for libmicrohttpd >= 0.9.31])
-              AC_RUN_IFELSE([AC_LANG_SOURCE([
+        AC_CHECK_LIB([microhttpd], [MHD_get_fdset2],
+          [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.42])
+              AC_COMPILE_IFELSE([AC_LANG_SOURCE([
                 #include "$native_srcdir/src/include/platform.h"
                #include <microhttpd.h>
-                int main () { return MHD_VERSION >= 0x0093002 ? 0 : 1; }
-               ])], [
-               AC_MSG_RESULT(ok)
-               lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]),
+                #if (MHD_VERSION < 0x0094200)
+                #error needs at least version 0.9.42
+                #endif
+               ])],
+               [AC_MSG_RESULT(ok)
+                lmhd=1],
+               [AC_MSG_RESULT(failed)])]),
        [],[#include "$native_srcdir/src/include/platform.h"
             #include <microhttpd.h>]),,
        [#include "$native_srcdir/src/include/platform.h"])])
 AM_CONDITIONAL(HAVE_MHD, test x$lmhd = x1)
 AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd])
 
+AM_CONDITIONAL(HAVE_JSON, [test x$jansson = x1])
 
 # restore LIBS
 LIBS=$SAVE_LIBS
@@ -824,10 +1010,7 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
 
 # check for gettext
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.16.1])
-
-# check for iconv
-AM_ICONV
+AM_GNU_GETTEXT_VERSION([0.18.1])
 
 # Checks for standard typedefs, structures, and compiler characteristics.
 AC_TYPE_PID_T
@@ -848,6 +1031,16 @@ AC_CHECK_MEMBER([struct sockaddr_in.sin_len],
       #include <netinet/in.h>
    ])
 
+AC_CHECK_MEMBER([struct sockaddr_un.sun_len],
+   [ AC_DEFINE(HAVE_SOCKADDR_UN_SUN_LEN, 1, [Do we have sockaddr_un.sun_len?])
+   ],
+   [],
+   [
+      #include <sys/types.h>
+      #include <sys/socket.h>
+      #include <sys/un.h>
+   ])
+
 
 
 # Checks for library functions.
@@ -865,33 +1058,11 @@ AC_FUNC_VPRINTF
 AC_HEADER_SYS_WAIT
 AC_TYPE_OFF_T
 AC_TYPE_UID_T
-AC_CHECK_FUNCS([atoll stat64 strnlen mremap getrlimit setrlimit sysconf initgroups strndup gethostbyname2 getpeerucred getpeereid setresuid $funcstocheck getifaddrs freeifaddrs getresgid mallinfo malloc_size malloc_usable_size getrusage random srandom stat statfs statvfs])
+AC_CHECK_FUNCS([atoll stat64 strnlen mremap getrlimit setrlimit sysconf initgroups strndup gethostbyname2 getpeerucred getpeereid setresuid $funcstocheck getifaddrs freeifaddrs getresgid mallinfo malloc_size malloc_usable_size getrusage random srandom stat statfs statvfs wait4])
 
 # restore LIBS
 LIBS=$SAVE_LIBS
 
-gn_user_home_dir="~/.gnunet"
-AC_ARG_WITH(user-home-dir,
-        AC_HELP_STRING(
-                [--with-user-home-dir=DIR],
-                [default user home directory (~/.gnunet)]),
-        [gn_user_home_dir=$withval])
-AC_SUBST(GN_USER_HOME_DIR, $gn_user_home_dir)
-gn_daemon_home_dir="/var/lib/gnunet"
-AC_ARG_WITH(daemon-home-dir,
-        AC_HELP_STRING(
-                [--with-daemon-home-dir=DIR],
-                [default daemon home directory (/var/lib/gnunet)]),
-        [gn_daemon_home_dir=$withval])
-AC_SUBST(GN_DAEMON_HOME_DIR, $gn_daemon_home_dir)
-gn_daemon_config_dir="/etc"
-AC_ARG_WITH(daemon-config-dir,
-        AC_HELP_STRING(
-                [--with-daemon-config-dir=DIR],
-                [default daemon config directory (/etc)]),
-        [gn_daemon_config_dir=$withval])
-AC_SUBST(GN_DAEMON_CONFIG_DIR, $gn_daemon_config_dir)
-
 GN_INTLINCL=""
 GN_LIBINTL="$LTLIBINTL"
 AC_ARG_ENABLE(framework, [  --enable-framework      enable Mac OS X framework build helpers],enable_framework_build=$enableval)
@@ -901,7 +1072,7 @@ then
   AC_DEFINE([FRAMEWORK_BUILD], 1, [Build a Mac OS X Framework])
   GN_INTLINCL='-I$(top_srcdir)/src/intlemu'
   GN_LIBINTL='$(top_builddir)/src/intlemu/libintlemu.la -framework CoreFoundation'
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$GN_INTLINCL]) 
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$GN_INTLINCL])
 fi
 
 GN_LIB_LDFLAGS="-export-dynamic -no-undefined"
@@ -966,16 +1137,20 @@ AC_ARG_WITH(nssdir,
    esac
   ],
   [
-   if test "x$SUDO_BINARY" != "x" -o -w /
-   then
+# This test is inappropriate when installation with DESTDIR is
+# run much later and uid will be root when needed. Enabling this
+# code breaks the gnunet.ebuild for gentoo.
+#
+#  if test "x$SUDO_BINARY" != "x" -o -w /
+#  then
      NSS_DIR="/lib"
      install_nss=1
      AC_MSG_RESULT([yes, to /lib])
-   else
-     NSS_DIR=
-     install_nss=0
-     AC_MSG_RESULT([no])
-   fi
+#  else
+#    NSS_DIR=
+#    install_nss=0
+#    AC_MSG_RESULT([no])
+#  fi
   ])
 AC_SUBST(NSS_DIR)
 AM_CONDITIONAL([INSTALL_NSS], [test "x$install_nss" != "x0"])
@@ -1005,6 +1180,7 @@ AC_SUBST(GNUNETDNS_GROUP)
 
 # gnutls
 gnutls=0
+gnutls_dane=0
 AC_MSG_CHECKING(for gnutls)
 AC_ARG_WITH(gnutls,
    [  --with-gnutls=PFX   base of gnutls installation],
@@ -1016,6 +1192,9 @@ AC_ARG_WITH(gnutls,
         AC_CHECK_HEADERS([gnutls/abstract.h],
             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))
         ;;
       *)
         LDFLAGS="-L$with_gnutls/lib $LDFLAGS"
@@ -1024,34 +1203,42 @@ AC_ARG_WITH(gnutls,
             AC_CHECK_LIB([gnutls], [gnutls_priority_set],
               EXT_LIB_PATH="-L$with_gnutls/lib $EXT_LIB_PATH"
               gnutls=true))
+        AC_CHECK_HEADERS([gnutls/dane.h],
+            AC_CHECK_LIB([gnutls-dane], [dane_verify_crt_raw],
+             gnutls_dane=1))
         ;;
     esac
    ],
    [AC_MSG_RESULT([--with-gnutls not specified])
     AC_CHECK_HEADERS([gnutls/abstract.h],
         AC_CHECK_LIB([gnutls], [gnutls_priority_set],
-          gnutls=true))])
+          gnutls=true))
+    AC_CHECK_HEADERS([gnutls/dane.h],
+        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])
+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])
 
 
 # Test if we are building for superMUC
-AC_MSG_CHECKING(if testbed should use IBM LoadLeveler to run on SuperMUC)
-AC_ARG_ENABLE([ll],
-    [AS_HELP_STRING([--enable-ll],
-       [build GNUnet testbed for use with IBM LoadLeveler for running testbed on
-              SuperMUC (default is NO)])],
-    [if test "x$enable_ll" = "xno"
+AC_MSG_CHECKING(if GNUnet is being configured to run on the SuperMUC)
+AC_ARG_ENABLE([supermuc],
+    [AS_HELP_STRING([--enable-supermuc],
+       [build GNUnet with support to run on the SuperMUC (default is NO)])],
+    [if test "x$enable_supermuc" = "xno"
      then
-       ll=0
+       supermuc=0
      else
-       ll=1
+       supermuc=1
      fi],
-    [ll=0
-     enable_ll=no])
-AC_MSG_RESULT($enable_ll)
-AM_CONDITIONAL([ENABLE_LL], [test "x$ll" = "x1"])
-AC_DEFINE_UNQUOTED([ENABLE_LL], [$ll], [Build with LL support])
+    [supermuc=0
+     enable_supermuc=no])
+AC_MSG_RESULT($enable_SUPERMUC)
+AM_CONDITIONAL([ENABLE_SUPERMUC], [test "x$supermuc" = "x1"])
+AC_DEFINE_UNQUOTED([ENABLE_SUPERMUC], [$supermuc], [Build with support for SuperMUC])
 
 # Check if NSE has to send timestamp information to testbed logger for
 # generating histogram of messages received
@@ -1152,6 +1339,42 @@ AC_ARG_ENABLE([experimental],
 AC_MSG_RESULT($enable_experimental)
 AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"])
 
+# should malicious code be compiled (should only be used for testing)?
+AC_MSG_CHECKING(whether to compile malicious code)
+AC_ARG_ENABLE([malicious],
+   [AS_HELP_STRING([--enable-malicious], [enable compiling malicious code])],
+   [if test "x$enableval" = "xno"
+     then
+       malicious=0
+     else
+       malicious=1
+     fi],
+   [malicious=0
+    enable_malicious=no])
+AC_MSG_RESULT($enable_malicious)
+AM_CONDITIONAL([ENABLE_MALICIOUS], [test 1=$malicious])
+AC_DEFINE_UNQUOTED([ENABLE_MALICIOUS], [$malicious],
+                   [enable compilation of malicious code])
+
+# 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
+# the service/module's conf.in file.
+AUTOSTART="YES"
+AC_MSG_CHECKING(whether to auto-start peer's services by default)
+AC_ARG_ENABLE([autostart],
+   [AS_HELP_STRING([--disable-autostart], [do not start peer's services by default])],
+   [enable_autostart=${enableval}
+    if test "x$enable_autostart" == "xno"
+    then
+        AUTOSTART="NO"
+    fi
+   ],
+   [enable_autostart=yes])
+AC_MSG_RESULT($enable_autostart)
+#AM_CONDITIONAL([HAVE_AUTOSTART], [test "x$enable_autostart" = "xyes"])
+AC_SUBST(AUTOSTART)
+
 # should memory statistics be kept (very expensive CPU-wise!)
 AC_MSG_CHECKING(whether to create expensive statistics on memory use)
 AC_ARG_ENABLE([heapstats],
@@ -1258,7 +1481,7 @@ AC_LINK_IFELSE(
 
 else
   AC_MSG_CHECKING(whether to enable windows workarounds)
-  AC_ARG_ENABLE([windows_workarounds], 
+  AC_ARG_ENABLE([windows_workarounds],
      [AS_HELP_STRING([--enable-windows_workarounds], [enable workarounds used on Windows (only useful for test cases)])],
      [enable_workarounds=${enableval}],
      [enable_workarounds=no])
@@ -1274,10 +1497,10 @@ AC_DEFINE_UNQUOTED([ENABLE_WINDOWS_WORKAROUNDS], $workarounds, [enable workaroun
 
 # gcov compilation
 AC_MSG_CHECKING(whether to compile with support for code coverage analysis)
-AC_ARG_ENABLE([coverage], 
+AC_ARG_ENABLE([coverage],
               AS_HELP_STRING([--enable-coverage],
                              [compile the library with code coverage support]),
-              [use_gcov=${enableval}], 
+              [use_gcov=${enableval}],
               [use_gcov=no])
 AC_MSG_RESULT($use_gcov)
 AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"])
@@ -1286,32 +1509,47 @@ AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"])
 # version info
 AC_PATH_PROG(svnversioncommand, svnversion)
 AC_PATH_PROG(gitcommand, git)
-if test "X$svnversioncommand" = "X" || test `$svnversioncommand -n '.'` = "exported"
-then
-  if test "X$gitcommand" = "X"
-  then
-    AC_DEFINE_UNQUOTED(VCS_VERSION, ["release"], [repository svn version])
-  else
-    gitver=$(git log -1 | grep "git-svn-id" | sed -e 's/.*@\([[0-9]]\+\) .*/\1/')
-    if test "X$gitver" = "X"
-    then
-      AC_DEFINE_UNQUOTED(VCS_VERSION, ["release"], [repository svn version])
-    else
-      AC_DEFINE_UNQUOTED(VCS_VERSION, ["svn-$gitver"], [repository svn version])
-    fi
-  fi
-else
-  AC_DEFINE_UNQUOTED(VCS_VERSION, ["svn-`svnversion -n`"], [repository svn version])
-fi
+AC_MSG_CHECKING(for source being under a VCS)
+svn_version=
+gitsvn_version=
+AS_IF([test ! "X$svnversioncommand" = "X"],
+[
+  svn_version=$(cd $srcdir ; $svnversioncommand -n 2>/dev/null)
+])
+AS_IF([test ! "X$gitcommand" = "X"],
+[
+  gitsvn_version=$(cd $srcdir ; git log -1 2>/dev/null | grep "git-svn-id" | sed -e 's/.*@\([[0-9]]\+\) .*/\1/')
+])
+AS_IF([test "X$svn_version" = "X" -o "X$svn_version" = "Xexported" -o "X$svn_version" = "XUnversioned directory"],
+[
+  AS_IF([test "X$gitsvn_version" = "X"],
+  [
+    vcs_name="no"
+    vcs_version="\"release\""
+  ],
+  [
+    vcs_name="yes, git-svn"
+    vcs_version="\"svn-r$gitsvn_version\""
+  ])
+],
+[
+  vcs_name="yes, svn"
+  vcs_version="\"svn-r$svn_version\""
+])
+AC_MSG_RESULT($vcs_name)
+
+AC_MSG_CHECKING(VCS version)
+AC_MSG_RESULT($vcs_version)
+AC_DEFINE_UNQUOTED(VCS_VERSION, [$vcs_version], [VCS revision/hash or tarball version])
 
-AC_CONFIG_FILES([ 
+AC_CONFIG_FILES([
 Makefile
 contrib/Makefile
 doc/Makefile
 doc/man/Makefile
 doc/doxygen/Makefile
 m4/Makefile
-po/Makefile.in 
+po/Makefile.in
 src/Makefile
 src/arm/Makefile
 src/arm/arm.conf
@@ -1319,13 +1557,17 @@ src/ats/Makefile
 src/ats/ats.conf
 src/ats-tool/Makefile
 src/ats-tests/Makefile
+src/auction/Makefile
 src/block/Makefile
+src/cadet/Makefile
+src/cadet/cadet.conf
 src/core/Makefile
 src/core/core.conf
 src/consensus/Makefile
 src/consensus/consensus.conf
 src/conversation/Makefile
 src/conversation/conversation.conf
+src/curl/Makefile
 src/datacache/Makefile
 src/datastore/Makefile
 src/datastore/datastore.conf
@@ -1335,37 +1577,45 @@ src/dns/Makefile
 src/dns/dns.conf
 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
 src/gns/Makefile
 src/gns/gns.conf
 src/gns/nss/Makefile
+src/gnsrecord/Makefile
 src/hello/Makefile
 src/identity/Makefile
 src/identity/identity.conf
+src/credential/Makefile
+src/credential/credential.conf
 src/include/Makefile
-src/include/gnunet_directories.h
 src/integration-tests/Makefile
+src/json/Makefile
+src/jsonapi/Makefile
 src/hostlist/Makefile
-src/mesh/Makefile
-src/mesh/mesh.conf
 src/multicast/Makefile
 src/multicast/multicast.conf
+src/my/Makefile
 src/mysql/Makefile
+src/namecache/Makefile
+src/namecache/namecache.conf
 src/namestore/Makefile
 src/namestore/namestore.conf
 src/nat/Makefile
+src/nat/nat.conf
+src/nat-auto/Makefile
+src/nat-auto/nat-auto.conf
 src/nse/Makefile
 src/nse/nse.conf
 src/peerinfo/Makefile
 src/peerinfo/peerinfo.conf
 src/peerinfo-tool/Makefile
-src/postgres/Makefile
+src/peerstore/Makefile
+src/peerstore/peerstore.conf
+src/pq/Makefile
+src/psycutil/Makefile
 src/psyc/Makefile
 src/psyc/psyc.conf
 src/psycstore/Makefile
@@ -1375,15 +1625,24 @@ 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/scalarproduct/Makefile
 src/scalarproduct/scalarproduct.conf
 src/set/Makefile
 src/set/set.conf
+src/social/Makefile
+src/social/social.conf
+src/sq/Makefile
 src/statistics/Makefile
 src/statistics/statistics.conf
 src/template/Makefile
 src/testbed/Makefile
 src/testbed/testbed.conf
+src/testbed-logger/Makefile
+src/testbed-logger/testbed-logger.conf
 src/testing/Makefile
 src/topology/Makefile
 src/transport/Makefile
@@ -1393,10 +1652,15 @@ src/util/Makefile
 src/util/resolver.conf
 src/vpn/Makefile
 src/vpn/vpn.conf
+src/zonemaster/Makefile
+src/zonemaster/zonemaster.conf
+src/rest/Makefile
+src/identity-provider/Makefile
 pkgconfig/Makefile
 pkgconfig/gnunetarm.pc
 pkgconfig/gnunetats.pc
 pkgconfig/gnunetblock.pc
+pkgconfig/gnunetcadet.pc
 pkgconfig/gnunetconsensus.pc
 pkgconfig/gnunetconversation.pc
 pkgconfig/gnunetcore.pc
@@ -1413,20 +1677,23 @@ pkgconfig/gnunetfs.pc
 pkgconfig/gnunetgns.pc
 pkgconfig/gnunethello.pc
 pkgconfig/gnunetidentity.pc
-pkgconfig/gnunetmesh.pc
+pkgconfig/gnunetmicrophone.pc
 pkgconfig/gnunetmulticast.pc
 pkgconfig/gnunetmysql.pc
 pkgconfig/gnunetnamestore.pc
 pkgconfig/gnunetnat.pc
 pkgconfig/gnunetnse.pc
 pkgconfig/gnunetpeerinfo.pc
-pkgconfig/gnunetpostgres.pc
+pkgconfig/gnunetpq.pc
 pkgconfig/gnunetpsyc.pc
 pkgconfig/gnunetpsycstore.pc
 pkgconfig/gnunetregex.pc
 pkgconfig/gnunetrevocation.pc
+pkgconfig/gnunetrps.pc
 pkgconfig/gnunetscalarproduct.pc
 pkgconfig/gnunetset.pc
+pkgconfig/gnunetsocial.pc
+pkgconfig/gnunetspeaker.pc
 pkgconfig/gnunetstatistics.pc
 pkgconfig/gnunettestbed.pc
 pkgconfig/gnunettesting.pc
@@ -1442,75 +1709,105 @@ AC_OUTPUT
 # warn user if mysql found but not used due to version
 if test "$mysqlfail" = "true"
 then
-  AC_MSG_NOTICE([NOTICE: MySQL found, but too old. MySQL support will not be compiled.])
+  AC_MSG_NOTICE([WARNING: MySQL found, but too old. MySQL support will not be compiled.])
 fi
 
 # sqlite
 if test "x$sqlite" = "x0"
 then
-  AC_MSG_NOTICE([NOTICE: sqlite not found.  sqLite support will not be compiled.])
+  AC_MSG_ERROR([ERROR: sqlite3 not found, but sqlite3 is required.])
 fi
 
-# libcurl
-if test "x$curl" = "x0"
+# libgnurl
+if test "$gnurl" = "0"
 then
-  AC_MSG_NOTICE([NOTICE: libcurl not found.  http client support will not be compiled.])
+  if test "x$curl" = "xfalse"
+  then
+    AC_MSG_NOTICE([WARNING: libgnurl not found.  http client support will not be compiled.])
+    AC_MSG_WARN([ERROR: libgnurl not found.  hostlist daemon will not be compiled, and you probably WANT the hostlist daemon])
+  else
+    AC_MSG_NOTICE([WARNING: libgnurl not found, trying to use libcurl-gnutls instead.])
+  fi
 fi
 
+
 # bluetooth
 if test "x$bluetooth" = "x0"
 then
-  AC_MSG_NOTICE([NOTICE: bluetooth library not found.  bluetooth support will not be compiled.])
+  AC_MSG_NOTICE([WARNING: bluetooth library not found.  bluetooth support will not be compiled.])
+fi
+
+# jansson
+if test "x$jansson" = "x0"
+then
+  AC_MSG_NOTICE([WARNING: jansson library not found.  json support will not be compiled.])
 fi
 
 #gnutls
 if test x$gnutls != xtrue
 then
-  AC_MSG_NOTICE([NOTICE: gnutls not found, gnunet-gns-proxy will not be built])
+  AC_MSG_NOTICE([WARNING: GnuTLS not found, gnunet-gns-proxy will not be built])
+else
+if test "x$gnutls_dane" != "x1"
+then
+  AC_MSG_NOTICE([WARNING: GnuTLS has no DANE support, DANE validation will not be possible])
+fi
 fi
 
 # java ports
 if test "x$enable_java_ports" = "xyes"
 then
-  AC_MSG_NOTICE([NOTICE: opening ports for gnunet-java bindings by default.])
+  AC_MSG_NOTICE([NOTICE: Opening ports for gnunet-java bindings by default.])
 fi
 
 # MHD
 if test "x$lmhd" != "x1"
 then
- AC_MSG_NOTICE([NOTICE: libmicrohttpd not found, http transport will not be installed.])
+ AC_MSG_NOTICE([WARNING: libmicrohttpd not found, http transport will not be installed.])
 fi
 
-# Pulse Audio
-if test "x$pulse" != "x1"
+# conversation
+if test "x$conversation_backend" = "xnone"
 then
- AC_MSG_NOTICE([NOTICE: libpulse(audio) not found, conversation will not be built.])
+  if test "x$pulse" != "x1"
+  then
+    AC_MSG_NOTICE([WARNING: libpulse(audio) not found, conversation will not be built.])
+  fi
+  if test "x$opus" != "x1"
+  then
+   AC_MSG_NOTICE([WARNING: libopus not found, conversation will not be built.])
+  fi
+  if test "x$gst" != "x1"
+  then
+   AC_MSG_NOTICE([WARNING: GStreamer not found, conversation will not be built.])
+  fi
 fi
 
-# Opus
-if test "x$opus" != "x1"
+if test "$extractor" != 1
 then
- AC_MSG_NOTICE([NOTICE: libopus not found, conversation will not be built.])
+ AC_MSG_WARN([ERROR: libextractor not found, but various file-sharing functions require it])
 fi
 
 AC_MSG_NOTICE([NOTICE: Database support is set to MySQL: $mysql, SQLite: $sqlite, Postgres: $postgres])
 
 if test "$enable_framework_build" = "yes"
 then
-  AC_MSG_NOTICE([NOTICE: Mac OS X framework build enabled.])
+  AC_MSG_NOTICE([Mac OS X framework build enabled.])
 fi
 
-if test "x$SUDO_BINARY" = "x" -a ! -w /
+if test "x$install_nss" = "x0"
 then
-  AC_MSG_NOTICE([NOTICE: --with-sudo not specified and not running as 'root', will not install GNS NSS library])
+  AC_MSG_NOTICE([WARNING: Will not install GNS NSS library])
+else
+  AC_MSG_NOTICE([NOTICE: Will install GNS NSS library to $NSS_DIR])
 fi
 
 
 AC_MSG_NOTICE([********************************************
 Please make sure NOW that you have created a user and group 'gnunet'
-and additionally a group 'gnunetdns':
+and additionally a group 'gnunetdns'. On Debian and Ubuntu GNU/Linux, type:
         addgroup gnunetdns
-        adduser gnunet
+        adduser --system --group --disabled-login --home /var/lib/gnunet gnunet
 
 Make sure that '/var/lib/gnunet' is owned (and writable) by user
 'gnunet'.  Then, you can compile GNUnet with
@@ -1518,16 +1815,18 @@ Make sure that '/var/lib/gnunet' is owned (and writable) by user
 
 After that, run (if necessary as 'root')
         make install
-to install everything. 
+to install everything.
 
 Each GNUnet user should be added to the 'gnunet' group (may
 require fresh login to come into effect):
-        adduser $USERNAME gnunet
+        adduser USERNAME gnunet
 (run the above command as root once for each of your users, replacing
-"$USERNAME" with the respective login names).  If you have a global IP
+"USERNAME" with the respective login names).  If you have a global IP
 address, no further configuration is required.
-       
-Optionally, download and compile gnunet-gtk to get a GUI for 
+
+For more detailed setup instructions, see https://gnunet.org/installation
+
+Optionally, download and compile gnunet-gtk to get a GUI for
 file-sharing and configuration.  This is particularly recommended
 if your network setup is non-trivial, as gnunet-setup can be
 used to test in the GUI if your network configuration is working.