1 files changed, 239 insertions, 341 deletions

diff --git a/configure.ac b/configure.ac
index 3e8d85eed..316257f97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # This file is part of GNUnet.
-# (C) 2001--2021 GNUnet e.V.
+# (C) 2001--2023 GNUnet e.V.
 #
 # GNUnet is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License as published
@@ -20,12 +20,22 @@
 #
 #
 AC_PREREQ([2.69])
-AC_INIT([gnunet], m4_esyscmd_s([contrib/get_version.sh]), [bug-gnunet@gnu.org])
+AC_INIT([gnunet],[m4_esyscmd_s(sh scripts/get_version.sh)],[bug-gnunet@gnu.org])
+
+gnunet_version=m4_esyscmd_s(sh scripts/get_version.sh)
+gnunet_major_version=m4_esyscmd_s(sh scripts/get_version.sh --major)
+gnunet_minor_version=m4_esyscmd_s(sh scripts/get_version.sh --minor)
+gnunet_micro_version=m4_esyscmd_s(sh scripts/get_version.sh --micro)
+
+AC_SUBST([gnunet_version])
+AC_SUBST([gnunet_major_version])
+AC_SUBST([gnunet_minor_version])
+AC_SUBST([gnunet_micro_version])
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIRS([m4])
 
-AC_CONFIG_HEADERS([gnunet_config.h])
+AC_CONFIG_HEADERS([gnunet_private_config.h])
 
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -43,6 +53,7 @@ AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_MKDIR_P
+PKG_PROG_PKG_CONFIG([0.29.2])
 
 LT_INIT([disable-static dlopen])
 
@@ -127,17 +138,20 @@ AS_CASE(["$host_os"],
   [*freebsd*],
   [CFLAGS="-D_THREAD_SAFE $CFLAGS"
    build_target="freebsd"
+   DEFAULT_INTERFACE="\"lo0\""
    xbsd="yes"
    LIBPREFIX=
    DLLDIR=lib
    UNIXONLY="#"
   ],
   [*openbsd*],
-  [# libc needs to be linked explicitly
-   LDFLAGS="$LDFLAGS -Wl -lc"
+  [AC_DEFINE([OPENBSD],[1],[Define to 1 if this is an OpenBSD system])
+   # libc needs to be linked explicitly
+   LDFLAGS="$OLD_LDFLAGS -lc"
    # and PIC has to be enabled
    CFLAGS="-fPIC $CFLAGS"
    build_target="openbsd"
+   DEFAULT_INTERFACE="\"lo0\""
    xbsd="yes"
    LIBPREFIX=
    DLLDIR=lib
@@ -145,6 +159,7 @@ AS_CASE(["$host_os"],
   ],
   [*netbsd*],
   [build_target="netbsd"
+   DEFAULT_INTERFACE="\"lo0\""
    xbsd="yes"
    LIBPREFIX=
    DLLDIR=lib
@@ -436,26 +451,11 @@ AC_ARG_ENABLE([documentation],
                               [do not build the documentation])],
               [documentation=${enableval}],
               [documentation=yes])
+
+AC_CHECK_PROG([DOXY_BINARY], [doxygen], [true], [false])
+AM_CONDITIONAL([HAVE_DOXY_BINARY], [$DOXY_BINARY])
+
 AM_CONDITIONAL([DOCUMENTATION], [test "x$documentation" = "xyes"])
-AS_IF([test "x$documentation" = "xyes"],
-      [AC_DEFINE([DOCUMENTATION], [1], [Define to 1 if documentation is built])],
-      [AC_DEFINE([DOCUMENTATION], [0], [Define to 1 if documentation is built])])
-
-AC_ARG_ENABLE([texi2mdoc-generation],
-              [AS_HELP_STRING([--enable-texi2mdoc-generation],
-                              [generate and install texi2mdoc output])],
-              [texi2mdoc_enabled=${enableval}],
-              [texi2mdoc_enabled=no])
-AM_CONDITIONAL([TEXI2MDOC_GENERATION], [test "x$texi2mdoc_enabled" = "xyes"])
-AS_IF([test "x$texi2mdoc_enabled" = "xyes"],
-  [AC_CHECK_PROGS([TEXI2MDOC_BINARY], [texi2mdoc], [false])
-   AS_IF([test "x$TEXI2MDOC_BINARY" != "xfalse"],
-     [AC_DEFINE([TEXI2MDOC_GENERATION], [1],
-                [Define to 1 if mdoc output is generated])],
-     [AC_DEFINE([TEXI2MDOC_GENERATION], [0],
-               [Define to 1 if mdoc output is generated])])],
-  [TEXI2MDOC_BINARY=false])
-AM_CONDITIONAL([HAVE_TEXI2MDOC], [test "x$TEXI2MDOC_BINARY" != "xfalse"])
 
 AC_CHECK_PROGS([MANDOC_BINARY], [mandoc], [false])
 AM_CONDITIONAL([HAVE_MANDOC], [test "x$MANDOC_BINARY" != "xfalse"])
@@ -484,44 +484,12 @@ AC_DEFINE_UNQUOTED([INCLUDE_MANPAGES], [$include_man],
                    [Define to 1 if man pages are included])
 AM_CONDITIONAL([INCLUDE_MANPAGES], [test "x$include_man" = "x1"])
 
-# Do we have texinfo4? If yes, it is used to set texinfo4 specific switches
-# (not syntax!) to the commandline tools which generate the html. If not,
-# texinfo5 switches are used. This comes with no version checks, is
-# enabled only at distributors action (ie defaults to "no").
-# Mantis #3914 for more details (https://bugs.gnunet.org/view.php?id=3914)
-# While GNU makeinfo 6.5 supports --css-ref=URL,
-# makeinfo 4.8 (in NetBSD 8.0, macOS, and maybe other
-# base) does only support --css-include=FILE.
-# The only difference is a shorter html output and
-# in 6.5 the ability to use refs instead of include.
-# We prefer not to break builds in this case, so
-# we use the include version which is backwards compatible
-# and upwards compatible, while the ref variant is neither.
-# In the 5.x version they added `--split=chapters|sections` in
-# addition to `--split=nodes`.
-# Hold on to your hats: In version 6.5 this is already removed, ffs.
-# GNU Texinfo, please be more consistent than 1 version in switches.
-AC_ARG_ENABLE([texinfo4],
-              [AS_HELP_STRING([--enable-texinfo4],
-                              [Use Texinfo version 4 specific switches])],
-              [activate_texinfo4=${enableval}],
-              [activate_texinfo4=no])
-AM_CONDITIONAL([ACTIVATE_TEXINFO4], [test "x$activate_texinfo4" = "xyes"])
-AS_IF([test "x$activate_texinfo4" = "xyes"],
-      [AC_DEFINE([ACTIVATE_TEXINFO4], [1],
-                 [Define to 1 if using Texinfo v4 switches])
-       TEXINFO_HTMLFLAGS="--no-split --css-include=style.css --css-include=manual.css"],
-      [AC_DEFINE([ACTIVATE_TEXINFO4], [0],
-                 [Define to 1 if using Texinfo v4 switches])
-       TEXINFO_HTMLFLAGS="--no-split --css-ref='../style.css' --css-ref='../manual.css'"])
-AC_SUBST([TEXINFO_HTMLFLAGS])
-
 # Hardening options
 AC_ARG_ENABLE([gcc-hardening],
   [AS_HELP_STRING([--enable-gcc-hardening], [enable compiler security checks])],
   [AS_IF([test "x$enableval" = "xyes"],
      [CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-all"
-      CFLAGS="$CFLAGS -fwrapv -fPIE -Wstacl-protector"
+      CFLAGS="$CFLAGS -fwrapv -fPIE -Wstack-protector"
       CFLAGS="$CFLAGS --param ssp-buffer-size=1"
       LDFLAGS="$LDFLAGS -pie"])])
 
@@ -635,16 +603,6 @@ gcry_md_close (mac);]])],
      [AC_MSG_RESULT([cross compiling, test skipped])])
    AC_LANG_POP([C])])
 
-AC_MSG_CHECKING([for static assertion support])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
-                     [[_Static_assert(sizeof(int) >= 4, "not big enough");]])],
-                  [AC_MSG_RESULT([yes])
-                   AC_DEFINE([HAVE_STATIC_ASSERT], [1],
-                             [Define to 1 if static assert is supported])],
-                  [AC_MSG_RESULT([no])
-                   AC_DEFINE([HAVE_STATIC_ASSERT], [0],
-                             [Define to 1 if static assert is supported])])
-
 dnl Helper function to shorten the amount of repeated code
 dnl It will create a --with-<lib> option for configure.
 dnl
@@ -714,6 +672,11 @@ CHECK_WITH_LIB([jansson], [json_loads], [jansson.h], [HAVE_JANSSON])
 AS_IF([test "x$jansson" = "x0"],
   [AC_MSG_ERROR([GNUnet requires jansson])])
 
+# check for jose
+CHECK_WITH_LIB([jose], [jose_jwk_gen], [jose/jose.h], [HAVE_JOSE])
+AS_IF([test "x$jose" = "x0"],
+  [AC_MSG_WARN([reclaimID OpenID Connect plugin requires jose])])
+
 # check for libpulse (pulseaudio)
 CHECK_WITH_LIB([pulse], [pa_stream_peek], [pulse/simple.h], [HAVE_PULSE])
 
@@ -726,18 +689,6 @@ CHECK_WITH_LIB([opus], [opus_decode_float], [opus/opus.h], [HAVE_OPUS])
 # check for libogg
 CHECK_WITH_LIB([ogg], [ogg_stream_flush_fill], [ogg/ogg.h], [HAVE_OGG])
 
-PKG_CHECK_MODULES([GLIB], [glib-2.0],
-  [AC_CHECK_HEADER([pbc/pbc.h], [pbc=1], [pbc=0])
-   AC_CHECK_HEADER([gabe.h], [abe=1], [abe=0])
-   AM_CONDITIONAL([HAVE_PBC], [test "x$pbc" = "x1"])
-   AM_CONDITIONAL([HAVE_ABE], [test "x$abe" = "x1"])
-   AC_DEFINE_UNQUOTED([HAVE_PBC], [$pbc], [Define to 1 if pbc is available])
-   AC_DEFINE_UNQUOTED([HAVE_ABE], [$abe], [Define to 1 if abe is available])],
-  [AM_CONDITIONAL([HAVE_PBC], [false])
-   AM_CONDITIONAL([HAVE_ABE], [false])
-   AC_DEFINE([HAVE_PBC], [0], [Define to 1 if pbc is available])
-   AC_DEFINE([HAVE_ABE], [0], [Define to 1 if abe is available])])
-
 PKG_CHECK_MODULES([GST],
   [glib-2.0 gobject-2.0 gstreamer-1.0 gstreamer-app-1.0 gstreamer-audio-1.0],
   [gst=1],
@@ -763,35 +714,36 @@ AS_IF([test "x$pulse" != "x1" || test "x$opus" != "x1" || test "x$ogg" != "x1"],
 AM_CONDITIONAL([BUILD_CONVERSATION], [test "x$conversation_backend" != "xnone"])
 AC_MSG_RESULT([$conversation_backend])
 
-# check for libgnurl
-LIBGNURL_CHECK_CONFIG([], [7.34.0],
-                      [gnurl=1
-                       curl=0],
-                      [gnurl=0
-                       curl=0])
-AS_IF([test "x$gnurl" = "x0"],
-  [LIBCURL_CHECK_CONFIG([], [7.34.0], [curl=1], [curl=0])
-   AS_IF([test "x$curl" = "x0"],
-     [AC_CHECK_HEADER([curl/curl.h],
-        [AC_CHECK_DECLS([CURLINFO_TLS_SESSION],
-                        [curl=1],
-                        [curl=0],
-                        [[#include <curl/curl.h>]])])
-      AC_CHECK_LIB([curl-gnutls],
-                   [curl_easy_getinfo],
-                   [curl_gnutls=1],
-                   [curl_gnutls=0])])
-   AS_IF([test "x$curl" = "x0" || test "x$curl_gnutls" = "x0"],
-     [AC_MSG_ERROR([cURL must have a version >= 7.34.0 and must support CURLINFO_TLS_SESSION])])])
-
-AS_IF([test "x$gnurl" = "x0" && test "x$curl" = "x0"],
-  [AC_MSG_ERROR([either gnurl or cURL must be available])])
-
-AM_CONDITIONAL([HAVE_LIBGNURL], [test "x$gnurl" = "x1"])
-AC_DEFINE_UNQUOTED([HAVE_LIBGNURL], [$gnurl], [Define to 1 if libgnurl is used])
-AM_CONDITIONAL([HAVE_LIBCURL], [test "x$curl" = "x1"])
-AC_DEFINE_UNQUOTED([HAVE_LIBCURL], [$curl], [Define to 0 if libcurl is used])
-
+# NOTE: If we find libcurl-gnutls here we set LIBCURL to -lcurl-gnutls
+# This affects the LIBCURL_CHECK_CONFIG call below as it takes LIBCURL into
+# account when checking for curl.
+LIBCURL="-lcurl"
+AC_CHECK_LIB([curl-gnutls],
+             [curl_easy_getinfo],
+             [LIBCURL="-lcurl-gnutls"])
+
+LIBCURL_CHECK_CONFIG([], [7.85.0], [],
+                     [AC_MSG_ERROR([cURL must have a version >= 7.85.0])])
+
+OLD_LIBS=$LIBS
+LIBS="$LIBS $LIBCURL"
+AC_RUN_IFELSE(
+     [AC_LANG_PROGRAM([[#include <curl/curl.h>]],
+                      [[return (CURLSSLSET_OK != curl_global_sslset(CURLSSLBACKEND_GNUTLS, NULL, NULL));]])],
+                    [curl_gnutls=1],
+                    [AC_MSG_WARN([cURL does not have GnuTLS backend])
+                     curl_gnutls=0])
+LIBS=$OLD_LIBS
+AM_CONDITIONAL([HAVE_GNUTLS_CURL], [test "x$curl_gnutls" = "x1"])
+AC_SUBST([curl_gnutls])
+
+# Even if curl is found, we check for this constant in order to determine
+# if we can use this feature.
+AC_CHECK_HEADER([curl/curl.h],
+                [AC_CHECK_DECLS([CURLINFO_TLS_SSL_PTR],
+                                [],
+                                [AC_MSG_ERROR([cURL must support CURLINFO_TLS_SSL_PTR])],
+                                [[#include <curl/curl.h>]])])
 # libatomic
 AC_SEARCH_LIBS([__atomic_load_8], [atomic],
                [have_libatomic=1
@@ -815,13 +767,10 @@ AC_CHECK_LIB([kvm], [kvm_open])
 AC_CHECK_LIB([kstat], [kstat_open])
 
 # check for libsodium version >= 1.0.18
-AC_CHECK_HEADER([sodium.h],
-  [AC_CHECK_LIB([sodium], [crypto_core_ed25519_scalar_mul],
-                [libsodium=1],
-                [libsodium=0])])
-
-AS_IF([test "x$libsodium" = "x0"],
-      [AC_MSG_ERROR([GNUnet requires libsodium >= 1.0.18])])
+libsodium=0
+CHECK_WITH_LIB([sodium], [crypto_core_ed25519_scalar_mul], [sodium.h], [HAVE_SODIUM])
+AS_IF([test "x$sodium" = "x0"],
+  [AC_MSG_ERROR([GNUnet requires libsodium >= 1.0.18])])
 
 # check for libextractor
 CHECK_WITH_LIB([extractor],
@@ -831,6 +780,14 @@ CHECK_WITH_LIB([extractor],
 AS_IF([test "x$extractor" = "x0"],
       [AC_MSG_RESULT([GNU libextractor not found, some features disabled])])
 
+# check for cloudflare-quiche
+CHECK_WITH_LIB([quiche],
+               [quiche_header_info],
+               [quiche.h],
+               [HAVE_QUICHE])
+AS_IF([test "x$quiche" = "x0"],
+      [AC_MSG_RESULT([cloudflare-quiche not found, some features disabled])])
+
 # check for libltdl
 CHECK_WITH_LIB([ltdl], [lt_dlopenext], [ltdl.h], [HAVE_LTDL])
 AS_IF([test "x$ldtl" = "x0"],
@@ -925,9 +882,9 @@ AC_DEFINE_UNQUOTED([HAVE_ZLIB], [$zlib_ok], [Define to 1 if zlib is available])
 AM_ICONV
 
 # check for libunistring
-gl_LIBUNISTRING
-AS_IF([test "x$HAVE_LIBUNISTRING" != "xyes"],
-      [AC_MSG_ERROR([GNUnet requires libunistring])])
+CHECK_WITH_LIB([unistring], [u16_strstr], [unistr.h], [HAVE_UNISTRING])
+AS_IF([test "x$unistring" = "x0"],
+  [AC_MSG_ERROR([GNUnet requires unistring])])
 
 # Currently broken on Debian :-(
 # AS_VERSION_COMPARE([$LIBUNISTRING_VERSION], [0.9.1.1],
@@ -947,102 +904,25 @@ AM_CONDITIONAL([HAVE_POSTGRESQL], [test "x$postgres" = "x1"])
 AC_DEFINE_UNQUOTED([HAVE_POSTGRESQL], [$postgres],
                    [Define to 1 if Postgres is available])
 
-# check for mysql
-SAVE_LDFLAGS="$LDFLAGS"
-SAVE_CPPFLAGS="$CPPFLAGS"
-AC_ARG_WITH([mysql],
-  [AS_HELP_STRING([--with-mysql=PFX], [base of mysql installation])],
-  [AS_CASE([$withval],
-     [no],
-     [],
-     [yes|""],
-     [AC_CHECK_HEADERS([mysql/mysql.h],
-        [AC_CHECK_LIB([mysqlclient], [mysql_init],
-                      [mysql=true], [mysql=false])])],
-     [LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql $LDFLAGS $ZLIBS"
-      CPPFLAGS="-I$with_mysql/include $CPPFLAGS"
-      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],
-                      [mysql=false])])])],
-   [AS_IF([test -d "/usr/lib64/mysql"],
-      [MYSQL_LIBDIR="/usr/lib64/mysql"],
-      [AS_IF([test -d "/usr/lib/mysql"],
-         [MYSQL_LIBDIR="/usr/lib/mysql"],
-         [MYSQL_LIBDIR="/usr/lib"])])
-    LDFLAGS="-L$MYSQL_LIBDIR $LDFLAGS $ZLIBS"
-    AC_CHECK_LIB([mysqlclient], [mysql_init],
-      [AC_CHECK_HEADERS([mysql/mysql.h],
-         [MYSQL_LDFLAGS="-L$MYSQL_LIBDIR"
-          mysql=true],
-         [mysql=false])],
-      [mysql=false])])
-AC_SUBST(MYSQL_LDFLAGS)
-AC_SUBST(MYSQL_CPPFLAGS)
-
-# additional version checks for mysql
-AS_IF([test "x$mysql" = "xtrue"],
-  [AC_MSG_CHECKING([for mysql version])
-   AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-     [[include <mysql/mysql_version.h>]],
-     [[#if (MYSQL_VERSION_ID < 40100)
-#error required at least version 4.1
-#endif]])],
-     [mysql=true],
-     [mysql=false])
-   AS_IF([test "x$mysql" = "xfalse"],
-     [AC_MSG_RESULT([< 4.1])
-      AC_MSG_RESULT([mysql version >= 4.1 required. Will not use MySQL])])
-   AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-     [[#include <mysql/mysql_version.h>]],
-     [[#if (MYSQL_VERSION_ID < 80000)
-#error needs at least version 8.0
-#endif]])],
-     [mysql8=true],
-     [mysql8=false])])
-
-AS_IF([test "x$mysql" = "xtrue"],
-  [AS_IF([test "x$mysql8" = "xfalse"],
-     [AC_MSG_RESULT([between 4.1 and 8.0])],
-     [AC_MSG_RESULT([> 8.0])
-      AC_DEFINE([HAVE_MYSQL8], [1],
-                [Define to 1 if MySQL is at least version 8])])])
-
-AM_CONDITIONAL([HAVE_MYSQL], [test "x$mysql" = "xtrue"])
-AM_CONDITIONAL([HAVE_MYSQLE], [false])
-
-AS_IF([test "x$sqlite3" = "x0" && test "x$mysql" = "xfalse" && test "x$postgres" = "x0"],
-  [AC_MSG_ERROR([GNUnet requires either SQLite, MySQL/MariaDB or PostgreSQL])])
-
-LDFLAGS="$SAVE_LDFLAGS"
 CPPFLAGS="$SAVE_CPPFLAGS"
 
 # check for libmicrohttpd
 AC_ARG_WITH([microhttpd],
   [AS_HELP_STRING([--with-microhttpd=PFX],
                   [base of libmicrohttpd installation])],
-  [httpd=${withval}],
-  [httpd=check])
-
-AS_CASE([$withval],
-  [no],
-  [AC_MSG_ERROR([GNUnet requires libmicrohttpd >= 0.9.63])],
-  [yes],
-  [PKG_CHECK_MODULES([MHD], [libmicrohttpd >= 0.9.63], [libmhd=1], [libmhd=0])],
   [SAVE_PKG_PATH="$PKG_CONFIG_PATH"
-   PKG_CONFIG_PATH="$httpd/lib/pkgconfig"
+   PKG_CONFIG_PATH="${withval}/lib/pkgconfig"
    export PKG_CONFIG_PATH
    PKG_CHECK_MODULES([MHD], [libmicrohttpd >= 0.9.63], [libmhd=1], [libmhd=0])
-   PKG_CONFIG_PATH="$SAVE_PKG_PATH"])
+   PKG_CONFIG_PATH="$SAVE_PKG_PATH"],
+  [PKG_CHECK_MODULES([MHD], [libmicrohttpd >= 0.9.63], [libmhd=1], [libmhd=0])])
 
 AS_IF([test "x$libmhd" = "x0"],
   [AC_MSG_ERROR([GNUnet requires libmicrohttpd >= 0.9.63])])
 
 AM_CONDITIONAL([HAVE_MHD], [test "x$libmhd" = "x1"])
 AC_DEFINE_UNQUOTED([HAVE_MHD], [$libmhd],
-                   [Define to 1 if libmicrohttpd is avaliable])
+                   [Define to 1 if libmicrohttpd is available])
 AM_CONDITIONAL([HAVE_REST], [true])
 
 # check for gnutls
@@ -1194,7 +1074,7 @@ AC_ARG_ENABLE([nse-histogram],
   [nse_histogram=0])
 AM_CONDITIONAL([ENABLE_NSE_HISTOGRAM], [test "x$nse_histogram" = "x1"])
 AC_DEFINE_UNQUOTED([ENABLE_NSE_HISTOGRAM], [$nse_histogram],
-                   [Define to 1 if NSE should send timestamp informations])
+                   [Define to 1 if NSE should send timestamp information])
 
 # check if 'make check' should run tests
 AC_ARG_ENABLE([testruns],
@@ -1232,9 +1112,15 @@ AC_SUBST([JAVAPORT])
 AC_ARG_ENABLE([experimental],
   [AS_HELP_STRING([--enable-experimental],
                   [enable experimental code paths (default is no)])],
-  [enable_experimental="${enableval}"]
-  [enable_experimental="no"])
-AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"])
+  [AS_IF([test "x$enableval" = "xno"],
+         [enable_experimental=0],
+         [enable_experimental=1])],
+  [enable_experimental=0])
+AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "x1"])
+AS_IF([test "x$enable_experimental" = "x1"],
+      AC_DEFINE([GNUNET_EXPERIMENTAL], 1, [Set to 1 is this is an experimental build]))
+
+AC_SUBST([enable_experimental])
 
 # check if malicious code should be compiled (for testing)
 AC_ARG_ENABLE([malicious],
@@ -1308,7 +1194,7 @@ AS_IF([test "x$enable_ttd" = "xyes"],
   [AC_DEFINE([ENABLE_TTD], [1],
              [Define if transport (not TNG) should warn about sending times.])])
 
-# get version informations
+# get version information
 AC_PATH_PROG([gitcommand], [git])
 AC_MSG_CHECKING([if source is under a VCS])
 AS_IF([test "x$gitcommand" = "x"],
@@ -1326,9 +1212,10 @@ AC_DEFINE_UNQUOTED([VCS_VERSION], [$vcs_version],
 
 AC_CONFIG_FILES([
 Makefile
-bin/Makefile
 contrib/Makefile
-contrib/hellos/Makefile
+data/Makefile
+data/hellos/Makefile
+scripts/Makefile
 contrib/services/Makefile
 contrib/services/openrc/Makefile
 contrib/services/systemd/Makefile
@@ -1337,112 +1224,141 @@ contrib/scripts/gnunet-logread/Makefile
 doc/Makefile
 doc/man/Makefile
 doc/doxygen/Makefile
-doc/handbook/Makefile
-doc/tutorial/Makefile
 m4/Makefile
 po/Makefile.in
 src/Makefile
-src/arm/Makefile
-src/arm/arm.conf
-src/ats/Makefile
-src/ats/ats.conf
-src/ats-tool/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
-src/dht/Makefile
-src/dht/dht.conf
-src/dhtu/Makefile
-src/dns/Makefile
-src/dns/dns.conf
-src/exit/Makefile
-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/lib/Makefile
+src/lib/util/Makefile
+src/lib/block/Makefile
+src/lib/curl/Makefile
+src/lib/gnsrecord/Makefile
+src/lib/json/Makefile
+src/lib/pq/Makefile
+src/lib/sq/Makefile
+src/plugin/Makefile
+src/plugin/block/Makefile
+src/plugin/datacache/Makefile
+src/plugin/datastore/Makefile
+src/plugin/dht/Makefile
+src/plugin/dns/Makefile
+src/plugin/fs/Makefile
+src/plugin/gns/Makefile
+src/plugin/gnsrecord/Makefile
+src/plugin/namecache/Makefile
+src/plugin/namestore/Makefile
+src/plugin/peerstore/Makefile
+src/plugin/reclaim/Makefile
+src/plugin/regex/Makefile
+src/plugin/revocation/Makefile
+src/plugin/seti/Makefile
+src/plugin/setu/Makefile
+src/plugin/messenger/Makefile
+src/service/Makefile
+src/service/arm/Makefile
+src/service/arm/arm.conf
+src/service/cadet/Makefile
+src/service/cadet/cadet.conf
+src/service/core/Makefile
+src/service/core/core.conf
+src/service/datacache/Makefile
+src/service/datastore/Makefile
+src/service/datastore/datastore.conf
+src/service/dht/Makefile
+src/service/dht/dht.conf
+src/service/dns/Makefile
+src/service/dns/dns.conf
+src/service/exit/Makefile
+src/service/fs/Makefile
+src/service/fs/fs.conf
+src/service/gns/Makefile
+src/service/gns/gns.conf
+src/service/gns/nss/Makefile
+src/service/hostlist/Makefile
+src/service/identity/Makefile
+src/service/identity/identity.conf
+src/service/messenger/Makefile
+src/service/messenger/messenger.conf
+src/service/namecache/Makefile
+src/service/namecache/namecache.conf
+src/service/namestore/Makefile
+src/service/namestore/namestore.conf
+src/service/nat/Makefile
+src/service/nat/nat.conf
+src/service/nat-auto/Makefile
+src/service/nat-auto/nat-auto.conf
+src/service/nse/Makefile
+src/service/nse/nse.conf
+src/service/peerstore/Makefile
+src/service/peerstore/peerstore.conf
+src/service/pt/Makefile
+src/service/reclaim/Makefile
+src/service/regex/Makefile
+src/service/regex/regex.conf
+src/service/rest/Makefile
+src/service/revocation/Makefile
+src/service/revocation/revocation.conf
+src/service/seti/Makefile
+src/service/seti/seti.conf
+src/service/setu/Makefile
+src/service/setu/setu.conf
+src/service/statistics/Makefile
+src/service/statistics/statistics.conf
+src/service/testing/Makefile
+src/service/topology/Makefile
+src/service/transport/Makefile
+src/service/transport/transport.conf
+src/service/util/Makefile
+src/service/util/resolver.conf
+src/service/vpn/Makefile
+src/service/vpn/vpn.conf
+src/service/zonemaster/Makefile
+src/service/zonemaster/zonemaster.conf
+src/cli/Makefile
+src/cli/arm/Makefile
+src/cli/cadet/Makefile
+src/cli/core/Makefile
+src/cli/datastore/Makefile
+src/cli/dht/Makefile
+src/cli/fs/Makefile
+src/cli/gns/Makefile
+src/cli/identity/Makefile
+src/cli/messenger/Makefile
+src/cli/namecache/Makefile
+src/cli/namestore/Makefile
+src/cli/peerstore/Makefile
+src/cli/nat/Makefile
+src/cli/nat-auto/Makefile
+src/cli/nse/Makefile
+src/cli/reclaim/Makefile
+src/cli/revocation/Makefile
+src/cli/statistics/Makefile
+src/cli/util/Makefile
+src/cli/vpn/Makefile
+src/contrib/Makefile
+src/contrib/service/Makefile
+src/contrib/service/abd/Makefile
+src/contrib/service/abd/abd.conf
+src/contrib/service/auction/Makefile
+src/contrib/service/consensus/Makefile
+src/contrib/service/consensus/consensus.conf
+src/contrib/service/conversation/Makefile
+src/contrib/service/conversation/conversation.conf
+src/contrib/service/scalarproduct/Makefile
+src/contrib/service/scalarproduct/scalarproduct.conf
+src/contrib/service/secretsharing/Makefile
+src/contrib/service/secretsharing/secretsharing.conf
+src/contrib/service/set/Makefile
+src/contrib/service/set/set.conf
+src/contrib/service/rps/Makefile
+src/contrib/service/rps/rps.conf
+src/contrib/service/template/Makefile
+src/contrib/cli/Makefile
+src/contrib/cli/template/Makefile
+src/lib/hello/Makefile
 src/include/Makefile
-src/integration-tests/Makefile
-src/json/Makefile
-src/hostlist/Makefile
-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/nt/Makefile
-src/peerinfo/Makefile
-src/peerinfo/peerinfo.conf
-src/peerinfo-tool/Makefile
-src/peerstore/Makefile
-src/peerstore/peerstore.conf
-src/pq/Makefile
-src/pt/Makefile
-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/seti/Makefile
-src/seti/seti.conf
-src/setu/Makefile
-src/setu/setu.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
-src/transport/transport.conf
-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/abe/Makefile
-src/reclaim/Makefile
-src/messenger/Makefile
-src/messenger/messenger.conf
+src/include/gnunet_config.h
 pkgconfig/Makefile
 pkgconfig/gnunetarm.pc
-pkgconfig/gnunetats.pc
 pkgconfig/gnunetblock.pc
 pkgconfig/gnunetcadet.pc
 pkgconfig/gnunetconsensus.pc
@@ -1452,19 +1368,18 @@ pkgconfig/gnunetdatacache.pc
 pkgconfig/gnunetdatastore.pc
 pkgconfig/gnunetdht.pc
 pkgconfig/gnunetdns.pc
-pkgconfig/gnunetenv.pc
-pkgconfig/gnunetfragmentation.pc
 pkgconfig/gnunetfs.pc
 pkgconfig/gnunetgns.pc
 pkgconfig/gnunethello.pc
 pkgconfig/gnunetidentity.pc
+pkgconfig/gnunetjson.pc
+pkgconfig/gnunetmessenger.pc
 pkgconfig/gnunetmicrophone.pc
-pkgconfig/gnunetmysql.pc
 pkgconfig/gnunetnamestore.pc
 pkgconfig/gnunetnat.pc
 pkgconfig/gnunetnse.pc
-pkgconfig/gnunetpeerinfo.pc
 pkgconfig/gnunetpq.pc
+pkgconfig/gnunetreclaim.pc
 pkgconfig/gnunetregex.pc
 pkgconfig/gnunetrevocation.pc
 pkgconfig/gnunetrps.pc
@@ -1472,7 +1387,6 @@ pkgconfig/gnunetscalarproduct.pc
 pkgconfig/gnunetset.pc
 pkgconfig/gnunetspeaker.pc
 pkgconfig/gnunetstatistics.pc
-pkgconfig/gnunettestbed.pc
 pkgconfig/gnunettesting.pc
 pkgconfig/gnunettransport.pc
 pkgconfig/gnunetutil.pc
@@ -1488,13 +1402,13 @@ AS_IF([test "x$enable_java_ports" = "xyes"],
   [java_msg="no"])
 
 # experimental code is enabled
-AS_IF([test "x$enable_experimental" = "xyes"],
+AS_IF([test "x$enable_experimental" = "x1"],
   [experimental_msg="yes"],
   [experimental_msg="no"])
 
 # experimental code for transport is enabled
 transport_msg="tcp udp unix http"
-AS_IF([test "x$build_target" = "xlinux" && test "x$enable_experimental" = "xyes"],
+AS_IF([test "x$build_target" = "xlinux" && test "x$enable_experimental" = "x1"],
   [transport_msg="tcp udp unix http wlan"])
 
 # libidn version
@@ -1502,23 +1416,15 @@ AS_IF([test "x$libidn_version" = "x2"],
   [libidn_msg="libidn2"],
   [libidn_msg="libidn"])
 
-# texi2mdoc
-AS_IF([test "x$texi2mdoc_enabled" = "xyes"],
-  [mdocml_msg="yes"],
-  [mdocml_msg="no"])
-AS_IF([test "x$TEXI2MDOC_BINARY" = "xfalse"],
-  [mdocbin_msg="no"],
-  [mdocbin_msg="yes"])
-
 # mandoc
 AS_IF([test "x$MANDOC_BINARY" = "xfalse"],
   [mandoc_msg="no"],
   [mandoc_msg="yes"])
 
-# texinfo
-AS_IF([test "x$documentation" = "xyes"],
-  [texinfo_msg="yes"],
-  [texinfo_msg="no"])
+# doxy
+AS_IF([$DOXY_BINARY],
+  [doxy_msg="yes"],
+  [doxy_msg="no"])
 
 # conversation
 conversation_msg="no"
@@ -1552,6 +1458,8 @@ AS_IF([test "x$extractor" = "x0"],
    AC_MSG_WARN([libextractor not found, but various file-sharing operations require it])],
   [libextractor_msg="yes"])
 
+AC_SUBST([extractor])
+
 # libzbar
 AS_IF([test "x$zbar" = "x1"],
   [libzbar_msg="yes"],
@@ -1562,12 +1470,9 @@ AS_IF([test "x$png" = "x1"],
   [libpng_msg="yes"],
   [libpng_msg="no"])
 
-# curl or gnurl
-AS_IF([test "x$gnurl" = "x1"],
-  [http_client="gnurl"],
-  [AS_IF([test "x$curl_gnutls" = "x1"],
-     [http_client="curl-gnutls"],
-     [http_client="curl-openssl"])])
+AS_IF([test "x$curl_gnutls" = "x0"],
+       [curl_tls_backend="OpenSSL"],
+       [curl_tls_backend="GnuTLS"])
 
 # ifconfig
 AS_IF([test "x$IFCONFIG_BINARY" = "xfalse"],
@@ -1610,11 +1515,6 @@ AS_IF([test "x$sqlite3" = "x1"],
    features_msg="sqlite $features_msg"],
   [sqlite_msg="no"])
 
-AS_IF([test "x$mysql" = "xtrue"],
-  [mysql_msg="yes"
-   features_msg="mysql $features_msg"],
-  [mysql_msg="no"])
-
 AS_IF([test "x$postgres" = "x1"],
   [postgres_msg="yes"
    features_msg="postgres $features_msg"],
@@ -1643,10 +1543,9 @@ Build Target:                   ${build_target}
 Default Interface:              ${interface_msg}
 
 sqlite3:                        ${sqlite_msg}
-MySQL:                          ${mysql_msg}
 PostgreSQL:                     ${postgres_msg}
 
-HTTP Client:                    ${http_client}
+cURL TLS backend:               ${curl_tls_backend}
 Bluetooth:                      ${bluetooth_msg}
 iptables:                       ${iptables_msg}
 ifconfig:                       ${ifconfig_msg}
@@ -1665,7 +1564,7 @@ gstreamer:                      ${gstreamer_msg}
 
 Java:                           ${java_msg}
 
-texi2mdoc:                      ${mdocbin_msg}
+doxygen:                        ${doxy_msg}
 mandoc:                         ${mandoc_msg}
 
 GNUnet configuration
@@ -1676,12 +1575,11 @@ Conversation:                   ${conversation_msg}
 Database Backends               ${features_msg}
 Experimental Code:              ${experimental_msg}
 
-Texinfo Manual:                 ${texinfo_msg}
 Transpiled mdocml Manual:       ${mdocml_msg}
 ])
 
 AS_IF([test "x$MSG_USER_SETUP" != "xfalse"],
-  [AC_MSG_WARN([Please make sure NOW to create a user and group 'gnunet' and additionall a group 'gnunetdns'. Make sure that '/var/lib/gnunet' is owned (and writable) by user 'gnunet'.])
+  [AC_MSG_WARN([Please make sure NOW to create a user and group 'gnunet' and additionally a group 'gnunetdns'. Make sure that '/var/lib/gnunet' is owned (and writable) by user 'gnunet'.])
    AS_IF([test "x$HAVE_GNUNET_USER" != "x0"],
      [AC_MSG_NOTICE([To do this on this system, run:
 # addgroup gnunetdns