gnunet

Main GNUnet Logic
Log | Files | Refs | Submodules | README | LICENSE
commit 29d329fccdde276c05e6ae7a7c72cd5f23df862d
parent 056a24676176c15bb617afd952fa6e699415efa8
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date:   Tue, 16 Sep 2025 12:00:37 +0200

build: Remove autotools. Fixes #9555

Diffstat:

DMakefile.am | 81-------------------------------------------------------------------------------


Dacinclude.m4 | 66------------------------------------------------------------------


Mbootstrap | 40----------------------------------------


Dconfigure.ac | 1636-------------------------------------------------------------------------------


Dcontrib/Makefile.am | 236-------------------------------------------------------------------------------


Dcontrib/scripts/Makefile.am | 82-------------------------------------------------------------------------------


Dcontrib/scripts/gnunet-logread/Makefile.am | 33---------------------------------


Dcontrib/services/Makefile.am | 1-


Dcontrib/services/openrc/Makefile.am | 7-------


Dcontrib/services/systemd/Makefile.am | 10----------


Ddata/Makefile.am | 22----------------------


Ddata/hellos/Makefile.am | 6------


Ddoc/Makefile.am | 37-------------------------------------


Ddoc/doxygen/Makefile.am | 21---------------------


Ddoc/man/Makefile.am | 97-------------------------------------------------------------------------------


Ddoc/old/handbook/Makefile.am | 143-------------------------------------------------------------------------------


Ddoc/old/tutorial/Makefile.am | 79-------------------------------------------------------------------------------


Dm4/.gitignore | 6------


Dm4/ChangeLog | 100-------------------------------------------------------------------------------


Dm4/Makefile.am | 41-----------------------------------------


Dm4/absolute-header.m4 | 77-----------------------------------------------------------------------------


Dm4/ac_define_dir.m4 | 35-----------------------------------


Dm4/align.m4 | 35-----------------------------------


Dm4/as-auto-alt.m4 | 50--------------------------------------------------


Dm4/ax_compare_version.m4 | 177-------------------------------------------------------------------------------


Dm4/ax_lib_postgresql.m4 | 247-------------------------------------------------------------------------------


Dm4/build-to-host.m4 | 79-------------------------------------------------------------------------------


Dm4/check-latex-package.m4 | 42------------------------------------------


Dm4/check-libheader.m4 | 29-----------------------------


Dm4/codeset.m4 | 23-----------------------


Dm4/extensions.m4 | 118-------------------------------------------------------------------------------


Dm4/extern-inline.m4 | 70----------------------------------------------------------------------


Dm4/fcntl-o.m4 | 134-------------------------------------------------------------------------------


Dm4/freetype2.m4 | 178-------------------------------------------------------------------------------


Dm4/gettext.m4 | 386-------------------------------------------------------------------------------


Dm4/glib-2.0.m4 | 212-------------------------------------------------------------------------------


Dm4/glib-gettext.m4 | 380-------------------------------------------------------------------------------


Dm4/glibc2.m4 | 31-------------------------------


Dm4/glibc21.m4 | 34----------------------------------


Dm4/gnulib-cache.m4 | 35-----------------------------------


Dm4/gtk-2.0.m4 | 196-------------------------------------------------------------------------------


Dm4/host-cpu-c-abi.m4 | 675-------------------------------------------------------------------------------


Dm4/iconv.m4 | 288-------------------------------------------------------------------------------


Dm4/intdiv0.m4 | 87-------------------------------------------------------------------------------


Dm4/intl.m4 | 298-------------------------------------------------------------------------------


Dm4/intldir.m4 | 19-------------------


Dm4/intlmacosx.m4 | 65-----------------------------------------------------------------


Dm4/intmax.m4 | 36------------------------------------


Dm4/inttypes-pri.m4 | 42------------------------------------------


Dm4/inttypes.m4 | 27---------------------------


Dm4/inttypes_h.m4 | 29-----------------------------


Dm4/isc-posix.m4 | 26--------------------------


Dm4/lcmessage.m4 | 35-----------------------------------


Dm4/lib-ld.m4 | 168-------------------------------------------------------------------------------


Dm4/lib-link.m4 | 800-------------------------------------------------------------------------------


Dm4/lib-prefix.m4 | 320-------------------------------------------------------------------------------


Dm4/libcurl.m4 | 272-------------------------------------------------------------------------------


Dm4/libgcrypt.m4 | 254-------------------------------------------------------------------------------


Dm4/libunistring.m4 | 143-------------------------------------------------------------------------------


Dm4/libxml2.m4 | 188-------------------------------------------------------------------------------


Dm4/lock.m4 | 42------------------------------------------


Dm4/longdouble.m4 | 31-------------------------------


Dm4/longlong.m4 | 113-------------------------------------------------------------------------------


Dm4/nls.m4 | 32--------------------------------


Dm4/perl.m4 | 48------------------------------------------------


Dm4/pkg.m4 | 275-------------------------------------------------------------------------------


Dm4/po.m4 | 450-------------------------------------------------------------------------------


Dm4/printf-posix.m4 | 48------------------------------------------------


Dm4/progtest.m4 | 91-------------------------------------------------------------------------------


Dm4/signed.m4 | 19-------------------


Dm4/size_max.m4 | 79-------------------------------------------------------------------------------


Dm4/stdint_h.m4 | 27---------------------------


Dm4/threadlib.m4 | 389-------------------------------------------------------------------------------


Dm4/uintmax_t.m4 | 30------------------------------


Dm4/ulonglong.m4 | 48------------------------------------------------


Dm4/visibility.m4 | 77-----------------------------------------------------------------------------


Dm4/xsize.m4 | 12------------


Dpkgconfig/Makefile.am | 79-------------------------------------------------------------------------------


Dscripts/Makefile.am | 39---------------------------------------


Dsrc/Makefile.am | 11-----------


Dsrc/cli/Makefile.am | 21---------------------


Dsrc/cli/arm/Makefile.am | 45---------------------------------------------


Dsrc/cli/cadet/Makefile.am | 26--------------------------


Dsrc/cli/core/Makefile.am | 24------------------------


Dsrc/cli/datastore/Makefile.am | 24------------------------


Dsrc/cli/dht/Makefile.am | 52----------------------------------------------------


Dsrc/cli/fs/Makefile.am | 107-------------------------------------------------------------------------------


Dsrc/cli/gns/Makefile.am | 108-------------------------------------------------------------------------------


Dsrc/cli/hello/Makefile.am | 25-------------------------


Dsrc/cli/identity/Makefile.am | 35-----------------------------------


Dsrc/cli/messenger/Makefile.am | 25-------------------------


Dsrc/cli/namecache/Makefile.am | 20--------------------


Dsrc/cli/namestore/Makefile.am | 70----------------------------------------------------------------------


Dsrc/cli/nat-auto/Makefile.am | 26--------------------------


Dsrc/cli/nat/Makefile.am | 17-----------------


Dsrc/cli/nse/Makefile.am | 19-------------------


Dsrc/cli/reclaim/Makefile.am | 57---------------------------------------------------------


Dsrc/cli/revocation/Makefile.am | 52----------------------------------------------------


Dsrc/cli/statistics/Makefile.am | 40----------------------------------------


Dsrc/cli/util/Makefile.am | 108-------------------------------------------------------------------------------


Dsrc/cli/vpn/Makefile.am | 22----------------------


Dsrc/contrib/Makefile.am | 3---


Dsrc/contrib/cli/Makefile.am | 2--


Dsrc/contrib/cli/template/Makefile.am | 21---------------------


Dsrc/contrib/service/Makefile.am | 23-----------------------


Dsrc/contrib/service/abd/Makefile.am | 106-------------------------------------------------------------------------------


Dsrc/contrib/service/auction/Makefile.am | 75---------------------------------------------------------------------------


Dsrc/contrib/service/consensus/Makefile.am | 106-------------------------------------------------------------------------------


Dsrc/contrib/service/conversation/Makefile.am | 263-------------------------------------------------------------------------------


Dsrc/contrib/service/rps/Makefile.am | 149-------------------------------------------------------------------------------


Dsrc/contrib/service/scalarproduct/Makefile.am | 117-------------------------------------------------------------------------------


Dsrc/contrib/service/secretsharing/Makefile.am | 61-------------------------------------------------------------


Dsrc/contrib/service/set/Makefile.am | 111-------------------------------------------------------------------------------


Dsrc/contrib/service/template/Makefile.am | 41-----------------------------------------


Dsrc/include/Makefile.am | 126-------------------------------------------------------------------------------


Dsrc/lib/Makefile.am | 15---------------


Dsrc/lib/block/Makefile.am | 31-------------------------------


Dsrc/lib/curl/Makefile.am | 38--------------------------------------


Dsrc/lib/gnsrecord/Makefile.am | 106-------------------------------------------------------------------------------


Dsrc/lib/hello/Makefile.am | 33---------------------------------


Dsrc/lib/json/Makefile.am | 43-------------------------------------------


Dsrc/lib/mhd/Makefile.am | 44--------------------------------------------


Dsrc/lib/pq/Makefile.am | 51---------------------------------------------------


Dsrc/lib/sq/Makefile.am | 38--------------------------------------


Dsrc/lib/testing/Makefile.am | 97-------------------------------------------------------------------------------


Dsrc/lib/util/Makefile.am | 603-------------------------------------------------------------------------------


Dsrc/plugin/Makefile.am | 18------------------


Dsrc/plugin/block/Makefile.am | 37-------------------------------------


Dsrc/plugin/datacache/Makefile.am | 76----------------------------------------------------------------------------


Dsrc/plugin/datastore/Makefile.am | 144-------------------------------------------------------------------------------


Dsrc/plugin/dht/Makefile.am | 27---------------------------


Dsrc/plugin/dns/Makefile.am | 25-------------------------


Dsrc/plugin/fs/Makefile.am | 35-----------------------------------


Dsrc/plugin/gns/Makefile.am | 59-----------------------------------------------------------


Dsrc/plugin/gnsrecord/Makefile.am | 25-------------------------


Dsrc/plugin/messenger/Makefile.am | 26--------------------------


Dsrc/plugin/namecache/Makefile.am | 105-------------------------------------------------------------------------------


Dsrc/plugin/namestore/Makefile.am | 79-------------------------------------------------------------------------------


Dsrc/plugin/peerstore/Makefile.am | 45---------------------------------------------


Dsrc/plugin/reclaim/Makefile.am | 70----------------------------------------------------------------------


Dsrc/plugin/regex/Makefile.am | 40----------------------------------------


Dsrc/plugin/revocation/Makefile.am | 27---------------------------


Dsrc/plugin/seti/Makefile.am | 25-------------------------


Dsrc/plugin/setu/Makefile.am | 21---------------------


Dsrc/service/Makefile.am | 35-----------------------------------


Dsrc/service/arm/Makefile.am | 115-------------------------------------------------------------------------------


Dsrc/service/cadet/Makefile.am | 81-------------------------------------------------------------------------------


Dsrc/service/core/Makefile.am | 230-------------------------------------------------------------------------------


Dsrc/service/datacache/Makefile.am | 98-------------------------------------------------------------------------------


Dsrc/service/datastore/Makefile.am | 142-------------------------------------------------------------------------------


Dsrc/service/dht/Makefile.am | 84-------------------------------------------------------------------------------


Dsrc/service/dns/Makefile.am | 83-------------------------------------------------------------------------------


Dsrc/service/exit/Makefile.am | 38--------------------------------------


Dsrc/service/fs/Makefile.am | 369-------------------------------------------------------------------------------


Dsrc/service/gns/Makefile.am | 180-------------------------------------------------------------------------------


Dsrc/service/gns/nss/Makefile.am | 43-------------------------------------------


Dsrc/service/hostlist/Makefile.am | 83-------------------------------------------------------------------------------


Dsrc/service/identity/Makefile.am | 64----------------------------------------------------------------


Dsrc/service/messenger/Makefile.am | 165-------------------------------------------------------------------------------


Dsrc/service/namecache/Makefile.am | 76----------------------------------------------------------------------------


Dsrc/service/namestore/Makefile.am | 383-------------------------------------------------------------------------------


Dsrc/service/nat-auto/Makefile.am | 40----------------------------------------


Dsrc/service/nat/Makefile.am | 106-------------------------------------------------------------------------------


Dsrc/service/nse/Makefile.am | 85-------------------------------------------------------------------------------


Dsrc/service/peerstore/Makefile.am | 84-------------------------------------------------------------------------------


Dsrc/service/pils/Makefile.am | 85-------------------------------------------------------------------------------


Dsrc/service/pt/Makefile.am | 93-------------------------------------------------------------------------------


Dsrc/service/reclaim/Makefile.am | 102-------------------------------------------------------------------------------


Dsrc/service/regex/Makefile.am | 148-------------------------------------------------------------------------------


Dsrc/service/rest/Makefile.am | 75---------------------------------------------------------------------------


Dsrc/service/revocation/Makefile.am | 74--------------------------------------------------------------------------


Dsrc/service/seti/Makefile.am | 59-----------------------------------------------------------


Dsrc/service/setu/Makefile.am | 81-------------------------------------------------------------------------------


Dsrc/service/statistics/Makefile.am | 88-------------------------------------------------------------------------------


Dsrc/service/testbed/Makefile.am | 53-----------------------------------------------------


Dsrc/service/topology/Makefile.am | 47-----------------------------------------------


Dsrc/service/transport/Makefile.am | 421-------------------------------------------------------------------------------


Dsrc/service/util/Makefile.am | 50--------------------------------------------------


Dsrc/service/vpn/Makefile.am | 53-----------------------------------------------------


Dsrc/service/zonemaster/Makefile.am | 32--------------------------------


180 files changed, 0 insertions(+), 19179 deletions(-)

diff --git a/Makefile.am b/Makefile.am
@@ -1,81 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-# only documentation (ALL of the documentation)
-if DOCUMENTATION_ONLY
-  SUBDIRS = scripts doc
-else
-  SUBDIRS = m4 scripts src po pkgconfig
-endif
-
-# documentation on / off switch (affects all of the documentation)
-if DOCUMENTATION
-  SUBDIRS += doc
-endif
-
-SUBDIRS += contrib data scripts
-
-EXTRA_DIST = \
- ABOUT-NLS \
- config.rpath \
- acinclude.m4 \
- README.1st \
- .version
-
-gnunetincludedir = $(includedir)/gnunet
-#gnunetinclude_HEADERS = gnunet_config.h
-
-docdir = $(datadir)/doc/gnunet/
-doc_DATA = COPYING README
-
-ACLOCAL_AMFLAGS = -I m4
-
-if HAVE_UNCRUSTIFY_BINARY
-MCRUSTIFY = find $(top_srcdir) -type f -name '*.c' -or -name '*.h' -print0 | xargs -0 uncrustify -c $(top_srcdir)/uncrustify.cfg -q --replace --no-backup 2>&1 || true
-else
-MCRUSTIFY = echo "crustify: skipped"
-endif
-
-if HAVE_YAPF_BINARY
-MYAPF = find $(top_srcdir) -type f -name '*.py' -or -name '*.py.in' -print0 | xargs -0 $(YAPF_BINARY) -i 2>&1 || true
-else
-MYAPF = echo "yapf: skipped"
-endif
-
-pretty:
-	$(MCRUSTIFY)
-	$(MYAPF)
-
-lint: check-bashisms check-texinfo check-man check-python
-
-check-bashisms:
-if HAVE_CHECKBASHISMS
-	printf "If checkbashisms.pl is in PATH, run checkbashism on all .sh files.\n"
-	find '.' -type f ! -path '*/.*' ! -path '*/_*' -name '*.sh' -print0 | xargs -0 checkbashisms.pl -f 2>&1 | tee $(srcdir)/bashism.log || true
-else
-	printf "No checkbashisms in PATH, skipped"
-endif
-
-check-man:
-	printf "Running lint-man.sh in doc/man.\n"
-	@cd $(top_srcdir)/doc/man ; ../../contrib/scripts/lint/lint-man.sh || true
-
-check-python:
-	printf "Running flake8 and 2to3 if detected.\n"
-	$(top_srcdir)/contrib/scripts/lint/lint-python.sh || true
-
-if HAVE_AWK
-check-texinfo:
-	@cd $(top_srcdir); find . -type f ! -path '*/.*' -name '*.texi' -print0 | xargs -0 ./contrib/scripts/check-texinfo.awk > $(srcdir)/texinfo_lint.log || true
-endif
-
-gana: gana-gns gana-gnunet-signatures
-
-gana-gns:
-	@cd $(top_srcdir)/src/gana/gnu-name-system-record-types; make; cp gnu_name_system_record_types.h ../../../src/include/
-	@cd $(top_srcdir)/src/gana/gnu-name-system-default-tlds; make; cp tlds.conf ../../../src/gns
-
-gana-gnunet-signatures:
-	@cd $(top_srcdir)/src/gana/gnunet-signatures; make; cp gnunet_signatures.h ../../../src/include
-
-
diff --git a/acinclude.m4 b/acinclude.m4
@@ -1,65 +0,0 @@
-# See: http://gcc.gnu.org/ml/gcc/2000-05/msg01141.html
-AC_DEFUN([CHECK_PTHREAD],
-[
-	AC_CHECK_LIB(pthread,pthread_create,
-	[
-		PTHREAD_CPPFLAGS=
-		PTHREAD_LDFLAGS=
-		PTHREAD_LIBS=-lpthread
-	],[
-		AC_MSG_CHECKING(if compiler supports -pthread)
-		save_CPPFLAGS="$CPPFLAGS"
-		CPPFLAGS="$CPPFLAGS -pthread"
-		AC_TRY_LINK(
-		[
-			#include <pthread.h>
-		],[
-			pthread_create(0,0,0,0);
-		],[
-			AC_MSG_RESULT(yes)
-			PTHREAD_CPPFLAGS=-pthread
-			PTHREAD_LDFLAGS=-pthread
-			PTHREAD_LIBS=
-		],[
-			AC_MSG_RESULT(no)
-			AC_MSG_CHECKING(if compiler supports -pthreads)
-			save_CPPFLAGS="$CPPFLAGS"
-			CPPFLAGS="$save_CPPFLAGS -pthreads"
-			AC_TRY_LINK(
-			[
-				#include <pthread.h>
-			],[
-				pthread_create(0,0,0,0);
-			],[
-				AC_MSG_RESULT(yes)
-				PTHREAD_CPPFLAGS=-pthreads
-				PTHREAD_LDFLAGS=-pthreads
-				PTHREAD_LIBS=
-			],[
-				AC_MSG_RESULT(no)
-				AC_MSG_CHECKING(if compiler supports -threads)
-				save_CPPFLAGS="$CPPFLAGS"
-				CPPFLAGS="$save_CPPFLAGS -threads"
-				AC_TRY_LINK(
-				[
-					#include <pthread.h>
-				],[
-					pthread_create(0,0,0,0);
-				],[
-					AC_MSG_RESULT(yes)
-					PTHREAD_CPPFLAGS=-threads
-					PTHREAD_LDFLAGS=-threads
-					PTHREAD_LIBS=
-				],[
-					AC_MSG_ERROR([Your system is not supporting pthreads!])
-				])
-			])
-		])
-		CPPFLAGS="$save_CPPFLAGS"
-	])
-])
-
-dnl Checks for all prerequisites of the intl subdirectory,
-dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
-dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
-    AC_DEFUN([AM_INTL_SUBDIR], [])
-\ No newline at end of file
diff --git a/bootstrap b/bootstrap
@@ -71,25 +71,6 @@ check_yapf()
     fi
 }
 
-check_libtool()
-{
-    echo "checking for libtoolize / libtool... "
-
-    if existence libtool || \
-       existence libtoolize || \
-       existence glibtoolize || \
-       existence slibtool; then
-        autoreconf -if; ret=$?
-        if [ $ret -ne 0 ]; then
-          echo 'Error with `autoreconf -if`'
-          return $ret
-        fi
-    elif ! existence meson; then
-        echo "*** No libtoolize (libtool) or libtool or meson found, please install it ***" >&2;
-        exit 1
-    fi
-}
-
 submodules()
 {
     # Try to update the submodule. Since bootstrap
@@ -111,33 +92,12 @@ install_hooks()
   ln -fs $(pwd)/contrib/conf/commit-msg .git/hooks/commit-msg 2> /dev/null
 }
 
-pogen()
-{
-    . "scripts/pogen.sh" || exit 1
-}
-
-update_gana()
-{
-    . "scripts/gana_update.sh" || exit 1
-}
-
 main()
 {
     cleanup
     submodules
     check_uncrustify
     check_yapf
-    echo "Please note that we have changed our default build system to meson"
-    echo "If you want to build using autotools, pass 'autotools' to the bootstrap command"
-    # update_gana
-    if [ "$1" = "autotools" ]; then
-      check_libtool; ret=$?
-      if [ $ret -ne 0 ]; then
-        echo 'Error with checking for libtool'
-        return $ret
-      fi
-    fi
-    #pogen
     if test -d .git
     then
         install_hooks
diff --git a/configure.ac b/configure.ac
@@ -1,1636 +0,0 @@
-# This file is part of GNUnet.
-# (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
-# by the Free Software Foundation, either version 3 of the License,
-# or (at your option) any later version.
-#
-# GNUnet is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# SPDX-License-Identifier: AGPL3.0-or-later
-#
-# Process this file with autoconf to produce a configure script.
-#
-#
-AC_PREREQ([2.69])
-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_private_config.h])
-
-AC_CANONICAL_TARGET
-AC_CANONICAL_HOST
-
-AM_INIT_AUTOMAKE([tar-ustar])
-AM_SILENT_RULES([yes])
-
-# maybe use AC_USE_SYSTEM_EXTENSIONS?
-AH_TOP([#define _GNU_SOURCE 1])
-
-AC_PROG_AWK
-AC_PROG_CC
-AC_PROG_CC_C_O
-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])
-
-AS_IF([test "x$enable_shared" = "xno"],
-  [AC_MSG_ERROR([GNUnet works only with shared libraries, sorry])])
-
-AS_AUTOTOOLS_ALTERNATE
-
-AC_SYS_LARGEFILE
-AC_FUNC_FSEEKO
-AC_UNALIGNED_64_ACCESS
-
-# Helper to check cflags for compiler
-# CC_CHECK_CFLAGS(FLAG, [ACTION-IF-FOUND, [ACTION-IF-NOT-FOUND]])
-AC_DEFUN([CC_CHECK_CFLAGS_SILENT],
-  [AC_CACHE_VAL([AS_TR_SH([cc_cv_cflags_$1])],
-     [ac_save_CFLAGS="$CFLAGS"
-      CFLAGS="$CFLAGS $1 -Werror"
-      AC_LINK_IFELSE([AC_LANG_SOURCE([int main() { return 0; }])],
-                     [eval "AS_TR_SH([cc_cv_cflags_$1])='yes'"],
-                     [eval "AS_TR_SH([cc_cv_cflags_$1])='no'"])
-      CFLAGS="$ac_save_CFLAGS"])
-   AS_IF([eval test "x$]AS_TR_SH([cc_cv_cflags_$1])[" = "xyes"],
-         [$2],
-         [$3])
-])dnl
-
-# Check for FLAG and append it to CFLAGS if supported
-# CC_CHECK_CFLAG_APPEND(FLAG, [ACTION-IF-FOUND, [ACTION-IF-NOT-FOUND]])
-AC_DEFUN([CC_CHECK_CFLAG_APPEND],
-  [AC_CACHE_CHECK([if $CC supports $1],
-     [AS_TR_SH([cc_cv_cflags_$1])],
-     [CC_CHECK_CFLAGS_SILENT([$1])])
-   AS_IF([eval test "x$]AS_TR_SH([cc_cv_cflags_$1])[" = "xyes"],
-         [CFLAGS="$CFLAGS $1"; $2],
-         [$3])
-])dnl
-
-# Workaround for GCC not doing the proper thing when using a '-Wno' flag.
-# Works like CC_CHECK_CFLAG_APPEND except that the '-Wno' prefix is omitted
-# (e.g. '-Wno-foo' becomes 'foo')
-AC_DEFUN([CC_CHECK_CFLAG_WNO_APPEND],
-  [AC_CACHE_CHECK([if $CC supports -Wno-$1],
-     [AS_TR_SH([cc_cv_cflags__W$1])],
-     [CC_CHECK_CFLAGS_SILENT([-W$1])])
-   AS_IF([eval test "x$]AS_TR_SH([cc_cv_cflags__W$1])[" = "xyes"],
-         [CFLAGS="$CFLAGS -Wno-$1"; $2],
-         [$3])
-])dnl
-
-# Use no-strict-aliasing only if the compiler supports it
-CC_CHECK_CFLAG_APPEND([-fno-strict-aliasing])
-
-# We make heavy use of these, gcc 9 gives warnings so disable them.
-CC_CHECK_CFLAG_WNO_APPEND([address-of-packed-member])
-CC_CHECK_CFLAG_WNO_APPEND([tautological-constant-out-of-range-compare])
-
-OLD_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS -Wl,--unresolved-symbols=report-all"
-
-AS_CASE(["$host_os"],
-  [*darwin*|*rhapsody*|*macosx*],
-  [AC_DEFINE([DARWIN],[1],[Define to 1 if this is an Apple Darwin system])
-   CPPFLAGS="-D_APPLE_C_SOURCE $CPPFLAGS"
-   CFLAGS="-fno-common -D__APPLE_USE_RFC_3542 $CFLAGS"
-   LDFLAGS="$OLD_LDFLAGS"
-   build_target="darwin"
-   DEFAULT_INTERFACE="\"en0\""
-   LIBPREFIX=
-   DLLDIR=lib
-   UNIXONLY="#"
-   AC_CHECK_LIB([intl], [gettext])],
-  [linux*],
-  [AC_DEFINE([LINUX],[1],[Define to 1 if this is a system with a Linux kernel])
-   build_target="linux"
-   DEFAULT_INTERFACE="\"eth0\""
-   LIBPREFIX=
-   DLLDIR=lib
-   UNIXONLY="#"
-   AC_PATH_XTRA
-  ],
-  [*freebsd*],
-  [CFLAGS="-D_THREAD_SAFE $CFLAGS"
-   build_target="freebsd"
-   DEFAULT_INTERFACE="\"lo0\""
-   xbsd="yes"
-   LIBPREFIX=
-   DLLDIR=lib
-   UNIXONLY="#"
-  ],
-  [*openbsd*],
-  [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
-   UNIXONLY="#"
-  ],
-  [*netbsd*],
-  [build_target="netbsd"
-   DEFAULT_INTERFACE="\"lo0\""
-   xbsd="yes"
-   LIBPREFIX=
-   DLLDIR=lib
-   UNIXONLY="#"
-  ],
-  [*solaris*],
-  [AC_DEFINE([SOLARIS],[1],[Define to 1 if this is a Solaris system])
-   AC_DEFINE([_REENTRANT],[1],[Needed with Solaris or errno does not work])
-   AC_CHECK_LIB([resolv], [res_init])
-   AC_CHECK_LIB([rt], [nanosleep])
-   build_target="solaris"
-   DEFAULT_INTERFACE="\"eth0\""
-   LIBPREFIX=
-   DLLDIR=lib
-   UNIXONLY="#"
-  ],
-  [*arm-linux*],
-  [AC_DEFINE([LINUX],[1],[Define to 1 if this is a system with a Linux kernel])
-   CFLAGS="-D_REENTRANT -fPIC -pipe $CFLAGS"
-   build_target="linux"
-   DEFAULT_INTERFACE="\"eth0\""
-   LIBPREFIX=
-   DLLDIR=lib
-   UNIXONLY="#"
-  ],
-  [gnu*],
-  [AC_DEFINE([GNU],[1],[Define to 1 if this is a GNU system])
-   build_target="gnu"
-   DEFAULT_INTERFACE="\"eth0\""
-   UNIXONLY="#"
-  ],
-  [AC_DEFINE([OTHEROS],[1],[Define to 1 if this is some strange OS])
-   DEFAULT_INTERFACE="\"eth0\""
-  ])
-
-AC_DEFINE_UNQUOTED([GNUNET_DEFAULT_INTERFACE], [$DEFAULT_INTERFACE],
-  [The default choice for the name of the first network interface])
-AC_SUBST([DEFAULT_INTERFACE])
-
-# Disable TCP-based IPC on system supporting UNIX domain sockets
-AC_SUBST([UNIXONLY])
-
-AC_MSG_CHECKING([for build target])
-AM_CONDITIONAL([DARWIN], [test "$build_target" = "darwin"])
-AM_CONDITIONAL([SOLARIS], [test "$build_target" = "solaris"])
-AM_CONDITIONAL([XNETBSD], [test "$build_target" = "netbsd"])
-AM_CONDITIONAL([XFREEBSD], [test "$build_target" = "freebsd"])
-AM_CONDITIONAL([OPENBSD], [test "$build_target" = "openbsd"])
-AM_CONDITIONAL([XBSD], [test "x$bsd" = "xyes"])
-AM_CONDITIONAL([LINUX], [test "$build_target" = "linux"])
-AM_CONDITIONAL([GNU], [test "$build_target" = "gnu"])
-AC_MSG_RESULT([$build_target])
-
-AS_IF([test "$build_target" = "darwin"],
-      [AC_MSG_WARN([The VPN application cannot be compiled on your system])])
-
-AC_SUBST([build_target])
-
-# Other checks for standard libraries
-AC_SEARCH_LIBS([gethostbyname], [nsl ws2_32])
-AC_SEARCH_LIBS([memchr],[],
-               [AC_DEFINE([HAVE_MEMCHR],[1],
-                          [Define to 1 if memchr is supported])],
-               [])
-AC_SEARCH_LIBS([memset_s],[],
-               [AC_DEFINE([HAVE_MEMSET_S],[1],
-                          [Define to 1 if memset_s is supported])],
-               [])
-AC_SEARCH_LIBS([explicit_bzero],[],
-               [AC_DEFINE([HAVE_EXPLICIT_BZERO],[1],
-                          [Define to 1 if explicit_bzero is supported])],
-               [])
-
-AC_CHECK_LIB([socket], [socket])
-AC_CHECK_LIB([m], [log])
-AC_CHECK_FUNCS([getloadavg])
-
-AC_CHECK_PROG([GETOPT_BINARY], [getopt], [true], [false])
-AM_CONDITIONAL([HAVE_GETOPT_BINARY], [$GETOPT_BINARY])
-
-AC_CHECK_PROGS([PKG_CONFIG], [pkgconf pkg-config], [false])
-AM_CONDITIONAL([HAVE_PKG_CONFIG], [test "x$PKG_CONFIG" != "xfalse"])
-
-AC_CHECK_PROG([SSH_BINARY], [ssh], [true], [false])
-AM_CONDITIONAL([HAVE_SSH_BINARY], [$SSH_BINARY])
-
-AC_MSG_CHECKING([for SSH key])
-AS_IF([ssh -D 12345 -o "BatchMode Yes" -o "UserKnownHostsFile /tmp/gnunet_test_cosks_ssh_garbage" -o "StrictHostKeyChecking no" 127.0.0.1 echo -n 2>/dev/null],
-      [has_ssh_key=yes],
-      [has_ssh_key=no])
-AM_CONDITIONAL([HAVE_SSH_KEY], [test "x$has_ssh_key" = "xyes"])
-AC_MSG_RESULT([$has_ssh_key])
-
-AS_IF([test -f /tmp/gnunet_test_cosks_ssh_garbage],
-      [rm -f /tmp/gnunet_test_cosks_ssh_garbage])
-
-AM_PATH_PYTHON([3.4],,[:])
-AC_SUBST([PYTHON])
-AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != ':'])
-
-AC_ARG_WITH([perl],
-            [AS_HELP_STRING([--with-perl=PATH], [Look for Perl in PATH])],
-            [AS_CASE([$withval],
-             [no], [AC_MSG_ERROR([Perl is required])],
-             [yes], [AC_PATH_PROG([PERL], [perl])],
-             [AC_PATH_PROG([PERL], [perl], [], ["$withval"])])],
-            [AC_PATH_PROG([PERL], [perl])])
-AC_SUBST([PERL])
-AM_CONDITIONAL([HAVE_PERL], [test -x "$PERL"])
-AS_IF([test -x "$PERL"],
-      [AC_DEFINE([HAVE_PERL], [1], [Define to 1 if perl is available])],
-      [AC_DEFINE([HAVE_PERL], [0], [Define to 1 if perl is available])])
-
-AWK_BINARY="$AWK"
-AC_SUBST([AWK_BINARY])
-AM_CONDITIONAL([HAVE_AWK], [test -x "$AWK_BINARY"])
-AS_IF([test -x "$AWK_BINARY"],
-      [AC_DEFINE([HAVE_AWK], [1], [Define to 1 if awk is available])],
-      [AC_DEFINE([HAVE_AWK], [0], [Define to 1 if awk is available])])
-
-# check for some LaTeX packages used by gnunet-bcd
-CHECK_LATEX_PACKAGE([TikZ], [tikz])
-CHECK_LATEX_PACKAGE([QR Code], [qrcode])
-CHECK_LATEX_PACKAGE([Labels], [labels])
-AM_CONDITIONAL([HAVE_PDFLATEX], [test "x$PDFLATEX_BINARY" != "xno"])
-
-AC_ARG_WITH([gnunet-logread],
-            [AS_HELP_STRING([--with-gnunet-logread], [Install gnunet-logread])],
-            [logread=yes],
-            [logread=no])
-AS_IF([test "x$logread" = "xyes"],
-      [AM_CONDITIONAL([GNUNET_LOGREAD], [true])
-       AC_DEFINE([GNUNET_LOGREAD], [1],
-                 [Define to 1 if gnunet-logread is available])],
-      [AM_CONDITIONAL([GNUNET_LOGREAD], [false])
-       AC_DEFINE([GNUNET_LOGREAD], [0],
-                 [Define to 1 if gnunet-logread is available])])
-
-# iptables is a soft requirement to run tests
-AC_PATH_TARGET_TOOL([IPTABLES_BINARY], [iptables], [false])
-AS_IF([test "x$IPTABLES_BINARY" = "xfalse"],
-      [AS_IF([test -x "/sbin/iptables"],
-             [IPTABLES_BINARY="/sbin/iptables"],
-             [AS_IF([test -x "/usr/sbin/iptables"],
-                    [IPTABLES_BINARY="/usr/sbin/iptables"])])])
-
-AS_IF([test "x$IPTABLES_BINARY" != "xfalse"],
-      [AC_DEFINE_UNQUOTED([IPTABLES], ["$IPTABLES_BINARY"], [Path to iptables])],
-      [AC_MSG_WARN([iptables not found])])
-
-# also check for ip6tables
-AC_PATH_TARGET_TOOL([IP6TABLES_BINARY], [ip6tables], [false])
-AS_IF([test "x$IP6TABLES_BINARY" = "xfalse"],
-      [AS_IF([test -x "/sbin/ip6tables"],
-             [IP6TABLES_BINARY="/sbin/ip6tables"],
-             [AS_IF([test -x "/usr/sbin/ip6tables"],
-                    [IP6TABLES_BINARY="/usr/sbin/ip6tables"])])])
-
-AS_IF([test "x$IP6TABLES_BINARY" != "xfalse"],
-      [AC_DEFINE_UNQUOTED([IP6TABLES], ["$IP6TABLES_BINARY"],
-                          [Path to ip6tables])],
-      [AC_MSG_WARN([ip6tables not found])])
-
-# also check for ip
-AC_PATH_TARGET_TOOL([IP_BINARY], [ip], [false])
-AS_IF([test "x$IP_BINARY" = "xfalse"],
-      [AS_IF([test -x "/sbin/ip"],
-             [IP_BINARY="/sbin/ip"],
-             [AS_IF([test -x "/usr/sbin/ip"],
-                    [IP_BINARY="/usr/sbin/ip"])])])
-
-AS_IF([test "x$IP_BINARY" != "xfalse"],
-      [AC_DEFINE_UNQUOTED([PATH_TO_IP], ["$IP_BINARY"], [Path to ip])],
-      [AC_MSG_WARN([ip not found])])
-
-# locate ifconfig
-AC_PATH_TARGET_TOOL([IFCONFIG_BINARY], [ifconfig], [false])
-AS_IF([test "x$IFCONFIG_BINARY" = "xfalse"],
-      [AS_IF([test -x "/sbin/ifconfig"],
-             [IFCONFIG_BINARY="/sbin/ifconfig"],
-             [AS_IF([test -x "/usr/sbin/ifconfig"],
-                    [IFCONFIG_BINARY="/usr/sbin/ifconfig"])])])
-
-AS_IF([test "x$IFCONFIG_BINARY" != "xfalse"],
-      [AC_DEFINE_UNQUOTED([IFCONFIG], ["$IFCONFIG_BINARY"], [Path to ifconfig])],
-      [AC_MSG_WARN([ifconfig not found])])
-
-AC_PATH_PROG([MSG_USER_SETUP], [adduser], [false])
-
-# test if the 'gnunet' user and groups exist
-getent passwd gnunet > /dev/null
-HAVE_GNUNET_USER=$?
-getent group gnunet > /dev/null
-AS_IF([test x$? != x0],
-      [HAVE_GNUNET_USER=1])
-getent group gnunetdns > /dev/null
-AS_IF([test x$? != x0],
-      [HAVE_GNUNET_USER=1])
-
-AC_PATH_TARGET_TOOL([SYSCTL_BINARY], [sysctl], [false])
-AS_IF([test "x$SYSCTL_BINARY" = "xfalse"],
-      [AS_IF([test -x "/sbin/sysctl"],
-             [SYSCTL_BINARY="/sbin/sysctl"],
-             [AS_IF([test -x "/usr/sbin/sysctl"],
-                    [SYSCTL_BINARY="/usr/sbin/sysctl"])])])
-
-AS_IF([test "x$SYSCTL_BINARY" != "xfalse"],
-      [AC_DEFINE_UNQUOTED([SYSCTL], ["$SYSCTL_BINARY"], [Path to sysctl])],
-      [AC_MSG_WARN([sysctl not found])])
-
-# (mini)upnpc is a soft runtime requirement
-AC_PATH_TARGET_TOOL([UPNPC_BINARY], [upnpc], [false])
-AS_IF([test "x$UPNPC_BINARY" != "x$false"],
-      [AC_DEFINE_UNQUOTED([UPNPC], ["$UPNPC_BINARY"], [Path to upnpc binary])],
-      [AC_MSG_WARN([upnpc binary not found])])
-
-# the following tools might use a flag to specify their path or non-default
-# name (e.g. a versioned string instead of simply the program name)
-
-# checkbashisms
-AC_CHECK_PROGS([CHECKBASHISMS_BINARY], [checkbashisms checkbashisms.pl], [false])
-AM_CONDITIONAL([HAVE_CHECKBASHISMS], [test "x$CHECKBASHISMS_BINARY" != "xfalse"])
-
-# uncrustify
-AC_CHECK_PROG([UNCRUSTIFY_BINARY], [uncrustify], [true], [false])
-AM_CONDITIONAL([HAVE_UNCRUSTIFY_BINARY], [$UNCRUSTIFY_BINARY])
-
-# yapf
-# check only the 'yapf' name for now
-AC_CHECK_PROGS([YAPF_BINARY], [yapf], [false])
-AM_CONDITIONAL([HAVE_YAPF_BINARY], [test "x$YAPF_BINARY" != "xfalse"])
-
-AC_CHECK_MEMBER([struct tm.tm_gmtoff],
-                [AC_DEFINE([HAVE_TM_GMTOFF], [1],
-                           [Define to 1 if struct tm has the tm_gmtoff member])],
-                [],
-                [#include <time.h>])
-
-# "save" libs; only those libs found so far will be
-# linked against _everywhere_.  For the others, we
-# will be more selective!
-SAVE_LIBS=$LIBS
-
-have_addrinfo_a=0
-AC_CHECK_LIB([anl], [getaddrinfo_a],
-             [have_addrinfo_a=1
-              AC_DEFINE([HAVE_GETADDRINFO_A], [1],
-                        [Define to 1 if getaddrinfo_a is supported])])
-AM_CONDITIONAL([HAVE_GETADDRINFO_A], [test "x$have_addrinfo_a" = "x1"])
-
-# libgcrypt
-gcrypt=0
-gcrypt_api=1
-gcrypt_version=1.6.0
-AM_PATH_LIBGCRYPT(["$gcrypt_api:$gcrypt_version"], [gcrypt=1])
-AC_CHECK_DECLS([gcry_mpi_set_opaque_copy], [], [], [[#include <gcrypt.h>]])
-
-AS_IF([test "$gcrypt" = "0"],
-      [AC_MSG_ERROR([[You need libgcrypt to build this program.
-At least version $gcrypt_version (API $gcrypt_api) is required.]])])
-
-AC_DEFINE_UNQUOTED([NEED_LIBGCRYPT_VERSION], ["$gcrypt_version"],
-                   [Required libgcrypt version])
-
-AC_CHECK_HEADER([if_tun.h],
-  [AC_DEFINE([IF_TUN_HDR], ["if_tun.h"],
-             [How to include if_tun.h])
-   AC_CHECK_DECLS([struct in6_ifreq], [], [],
-                  [[#include <if_tun.h>]])],
-  [AC_CHECK_HEADER([linux/if_tun.h],
-     [AC_DEFINE([IF_TUN_HDR], ["linux/if_tun.h"],
-                [How to include if_tun.h])
-      AC_CHECK_DECLS([struct in6_ifreq], [], [],
-                     [[#include <linux/if_tun.h>]])],
-     [AC_CHECK_HEADER([net/if_tun.h],
-        [AC_DEFINE([IF_TUN_HDR], ["net/if_tun.h"],
-                   [How to include if_tun.h])
-         AC_CHECK_DECLS([struct in6_ifreq], [], [],
-                        [[#include <net/if_tun.h>]])],
-        [AC_CHECK_HEADER([net/tun/if_tun.h],
-           [AC_DEFINE([IF_TUN_HDR], ["net/tun/if_tun.h"],
-                      [How to include if_tun.h])
-            AC_CHECK_DECLS([struct in6_ifreq], [], [],
-                           [[#include <net/tun/if_tun.h>]])])])])])
-
-# Should documentation be built?
-AC_ARG_ENABLE([documentation],
-              [AS_HELP_STRING([--disable-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"])
-
-AC_CHECK_PROGS([MANDOC_BINARY], [mandoc], [false])
-AM_CONDITIONAL([HAVE_MANDOC], [test "x$MANDOC_BINARY" != "xfalse"])
-
-# check if only the documentation should be build
-AC_ARG_ENABLE([documentation-only],
-  [AS_HELP_STRING([--enable-documentation-only],
-                  [build only the documentation])],
-  [AS_IF([test "x${enableval}" = "xno"],
-     [documentation_only="0"],
-     [documentation_only="1"])],
-  [documentation_only="0"])
-AC_DEFINE_UNQUOTED([DOCUMENTATION_ONLY], [$documentation_only],
-                   [Define to 1 if only documentation is being built])
-AM_CONDITIONAL([DOCUMENTATION_ONLY], [test "x$documentation_only" = "x1"])
-
-# check if man pages should be included
-AC_ARG_ENABLE([include-manpages],
-  [AS_HELP_STRING([--disable-include-manpages],
-                  [do not include man pages during installation])],
-  [AS_IF([test "x${enableval}" = "xno"],
-     [include_man="0"],
-     [include_man="1"])],
-  [include_man="1"])
-AC_DEFINE_UNQUOTED([INCLUDE_MANPAGES], [$include_man],
-                   [Define to 1 if man pages are included])
-AM_CONDITIONAL([INCLUDE_MANPAGES], [test "x$include_man" = "x1"])
-
-# 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 -Wstack-protector"
-      CFLAGS="$CFLAGS --param ssp-buffer-size=1"
-      LDFLAGS="$LDFLAGS -pie"])])
-
-AC_ARG_ENABLE([linker-hardening],
-  [AS_HELP_STRING([--enable-linker-hardening], [enable linker security options])],
-  [AS_IF([test "x$enableval" = "xyes"],
-     [LDFLAGS="$LDFLAGS -z relro -z now"])])
-
-AC_ARG_ENABLE([sanitizer],
-  [AS_HELP_STRING([--enable-sanitizer],
-                  [enable address and undefined behaviour sanitizers])],
-  [AS_IF([test "x$enableval" = "xyes"],
-         [CFLAGS="$CFLAGS -fsanitize=address,undefined -fno-omit-frame-pointer"])])
-
-# Logging
-extra_logging=GNUNET_NO
-AC_ARG_ENABLE([logging],
-  [AS_HELP_STRING([--enable-logging@<:@=value@:>@],
-     [enable logging calls; possible values: yes,no,verbose,veryverbose (default yes)])],
-  [AS_CASE([$enableval],
-           [yes],
-           [extra_logging=GNUNET_NO],
-           [no],
-           [extra_logging=GNUNET_NO
-            AC_DEFINE([GNUNET_CULL_LOGGING], [1],
-                      [Define to 1 to cull all logging calls])],
-           [verbose],
-           [extra_logging=GNUNET_YES],
-           [veryverbose], [extra_logging=\(GNUNET_YES+1\)],
-           [extra_logging=GNUNET_NO])])
-AC_DEFINE_UNQUOTED([GNUNET_EXTRA_LOGGING], [$extra_logging],
-                   [Define to 1 if extra logging is enabled, 2 for very verbose logging])
-
-AC_ARG_ENABLE([poisoning],
-  [AS_HELP_STRING([--enable-poisoning],
-                  [enable poisoning of freed memory (good for debugging)])],
-  [enable_poisoning=${enableval}],
-  [enable_poisoning=missing])
-
-AS_IF([test "x$enable_poisoning" = "xmissing"],
-      [AS_IF([test "x$extra_logging" != "xGNUNET_NO"],
-             [enable_poisoning=yes],
-             [enable_poisoning=no])])
-
-AS_IF([test "x$enable_poisoning" = "xyes"],
-      [AC_DEFINE([ENABLED_POISONING], [1],
-                 [Define to 1 if freed memory is poisoned])],
-      [AC_DEFINE([ENABLED_POISONING], [0],
-                 [Define to 1 if freed memory is poisoned])])
-
-AS_IF([test "$build" = "$target"],
-  [AC_MSG_CHECKING([for a working HMAC])
-   AC_LANG_PUSH([C])
-   LIBS="$LIBS $LIBGCRYPT_LIBS"
-   CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS"
-   AC_RUN_IFELSE(
-     [AC_LANG_PROGRAM([#include <gcrypt.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
-};
-
-unsigned char key[] = { 0xfc, 0x62, 0x76, 0x35 };
-
-unsigned char result[] = {
-  0xa2, 0xb, 0x1, 0xd9, 0xc0, 0x8b, 0x5a, 0x12, 0x80,
-  0xd5, 0x50, 0x12, 0x8e, 0xd0, 0x5b, 0xb6, 0x5c, 0x87, 0x24, 0xe2, 0xd0,
-  0xd2, 0xaf, 0x63, 0xae, 0xd1, 0xd6, 0x64, 0x14, 0xe3, 0x6e, 0x61, 0x5b,
-  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))
-{
-  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)
-{
-  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)
-{
-  return 3;
-}
-
-gcry_md_close (mac);]])],
-     [AC_MSG_RESULT([yes])],
-     [AC_MSG_RESULT([no])
-      RESULT=$?
-      AS_CASE([$RESULT],
-              [1],
-              [AC_MSG_FAILURE([libgcrypt header version does not match library])],
-              [2],
-              [AC_MSG_FAILURE([HMAC test failed])],
-              [3],
-              [AC_MSG_FAILURE([HMAC test vector does not match. This is a known problem with libgcrypt 1.2.2 on Windows and it's fixed in 1.4.6])],
-              [])],
-     [AC_MSG_RESULT([cross compiling, test skipped])])
-   AC_LANG_POP([C])])
-
-dnl Helper function to shorten the amount of repeated code
-dnl It will create a --with-<lib> option for configure.
-dnl
-dnl CHECK_WITH_LIB(LIBNAME, FUNC, HEADER, DEFINE-SYM)
-dnl LIBNAME is the name of a library without the 'lib' prefix, e.g. 'bluetooth'
-dnl for 'libbluetooth'.
-dnl DEFINE-SYM is a symbol to define using AC_DEFINE; it will be set to 1 if the
-dnl library is available, 0 otherwise.
-dnl
-dnl The variable LIBNAME (that is, the identifier passed as the first argument)
-dnl is kept with the result: 0 if not available, 1 if available.
-dnl For example: CHECK_WITH_LIB(foo, ...) will generate $foo.
-AC_DEFUN([CHECK_WITH_LIB],
-[AC_ARG_WITH([$1],
-   [AS_HELP_STRING([--with-][$1][=PFX], [base of lib][$1][ installation])],
-   [AS_CASE([$withval],
-      [no],
-      [eval "AS_TR_SH([$1])=0"],
-      [yes],
-      [CHECK_LIBHEADER([m4_translit([$1], [a-z], [A-Z])],
-         [$1], [$2], [$3],
-         [eval "AS_TR_SH([$1])=1"],
-         [eval "AS_TR_SH([$1])=0"])],
-      [CHECK_LIBHEADER([m4_translit([$1], [a-z], [A-Z])],
-         [$1], [$2], [$3],
-         [eval "AS_TR_SH([$1])=1"],
-         [eval "AS_TR_SH([$1])=0"],
-         [-L${withval}/lib],
-         [-I${withval}/include])
-       AS_IF([test "x$][AS_TR_SH([$1])][" = "x1"],
-         [EXT_LIB_PATH="-L${withval}/lib $EXT_LIB_PATH"])])],
-    [CHECK_LIBHEADER([m4_translit([$1], [a-z], [A-Z])],
-         [$1], [$2], [$3],
-         [eval "AS_TR_SH([$1])=1"],
-         [eval "AS_TR_SH([$1])=0"])])
-
- AM_CONDITIONAL([$4], [test "x$][AS_TR_SH([$1])][" = "x1"])
- AC_DEFINE_UNQUOTED([$4], [$][AS_TR_SH([$1])], [Define to 1 if available])
-])dnl
-
-# check for libbluetooth
-CHECK_WITH_LIB([bluetooth],
-               [ba2str],
-               [bluetooth/bluetooth.h],
-               [HAVE_LIBBLUETOOTH])
-
-# check for libzbar
-CHECK_WITH_LIB([zbar], [zbar_processor_create], [zbar.h], [HAVE_ZBAR])
-
-# check for libpng library
-# this check is for an optional feature of gnunet-qr.
-# the PNG format was chosen mostly arbitrarilyy: while it's true that more
-# modern formats exists that can be used in stead of PNG, it's also true that
-# it's more common for systems to ship with libpng than other codecs; also, a
-# black-or-white picture of squares is one of the cases where PNG shines the
-# most, so the advantages of other formats becomes less important.
-AS_IF([test "x$zbar" = "x1"],
-      [CHECK_WITH_LIB([png], [png_create_read_struct], [png.h], [HAVE_PNG])],
-      [AM_CONDITIONAL([HAVE_PNG], [false])
-       AC_DEFINE([HAVE_PNG], [0], [Define to 1 if libpng is available])])
-
-# check for libpabc
-CHECK_WITH_LIB([pabc], [pabc_new_ctx], [pabc/pabc.h], [HAVE_PABC])
-
-# check for jansson
-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])
-
-# check for libopus
-# Note: this might need to be expanded if a more detailed check is needed.
-# For example, before CHECK_WITH_LIB was created, it used to look for
-# "OPUS_SET_GAIN" in libopus
-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([GST],
-  [glib-2.0 gobject-2.0 gstreamer-1.0 gstreamer-app-1.0 gstreamer-audio-1.0],
-  [gst=1],
-  [gst=0])
-
-# check if conversation can be built and how
-AC_MSG_CHECKING([for conversation feature set to build])
-AS_IF([test "x$pulse" != "x1" || test "x$opus" != "x1" || test "x$ogg" != "x1"],
-  [AS_IF([test "x$gst" != "x1"],
-     [conversation_backend="none"
-      AM_CONDITIONAL([BUILD_PULSE_HELPERS], [false])
-      AM_CONDITIONAL([BUILD_GST_HELPERS], [false])
-      AM_CONDITIONAL([BUILD_EXPERIMENTAL_HELPERS], [false])],
-     [conversation_backend="gst"
-      AM_CONDITIONAL([BUILD_PULSE_HELPERS], [false])
-      AM_CONDITIONAL([BUILD_GST_HELPERS], [true])
-      AM_CONDITIONAL([BUILD_EXPERIMENTAL_HELPERS], [false])])],
-  [conversation_backend="pulse"
-   AM_CONDITIONAL([BUILD_PULSE_HELPERS], [true])
-   AM_CONDITIONAL([BUILD_GST_HELPERS], [false])
-   AM_CONDITIONAL([BUILD_EXPERIMENTAL_HELPERS], [false])])
-
-AM_CONDITIONAL([BUILD_CONVERSATION], [test "x$conversation_backend" != "xnone"])
-AC_MSG_RESULT([$conversation_backend])
-
-# 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>]])])
-
-# check for nss
-AC_CHECK_HEADERS([nss.h], [nss=true], [nss=false])
-AS_IF([test "x$nss" = "xfalse"],
-      [AM_CONDITIONAL([HAVE_GLIBCNSS], [false])
-       AC_MSG_WARN([NSS plugin will not be build])],
-      [AC_CHECK_DECL([NSS_STATUS_UNAVAIL],
-         [AM_CONDITIONAL([HAVE_GLIBCNSS], [true])],
-         [AM_CONDITIONAL([HAVE_GLIBCNSS], [false])
-          AC_MSG_WARN([NSS plugin will not be built])],
-         [[#include <nss.h>]])])
-
-# libatomic
-AC_SEARCH_LIBS([__atomic_load_8], [atomic], [
-  AS_IF([test x$ac_cv_search___atomic_load_8 != "xnone required"],
-    [ATOMICLIB=$ac_cv_search___atomic_load_8], [ATOMICLIB=])
-  AC_SUBST([ATOMICLIB])
-  ], [AC_MSG_ERROR([No library found that provides __atomic_load_8()])
-])
-
-# test for kvm and kstat (for CPU stats under BSD/Solaris)
-AC_CHECK_LIB([kvm], [kvm_open])
-AC_CHECK_LIB([kstat], [kstat_open])
-
-# check for libsodium version >= 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],
-               [EXTRACTOR_plugin_add_defaults],
-               [extractor.h],
-               [HAVE_LIBEXTRACTOR])
-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"],
-      [AC_MSG_RESULT([libltdl (from GNU libtool) is required])])
-
-# check for libidn, first version 2 and if not found, version 1
-# if both are missing throw an error as libidn is required
-AC_ARG_WITH([libidn],
-  [AS_HELP_STRING([--with-libidn=PFX], [base of libidn/libidn2 installation])],
-  [libidn=${withval}],
-  [libidn=yes])
-
-AS_IF([test "x$libidn" = "xno"],
-      [AC_MSG_ERROR([GNUnet requires libidn or libidn2])])
-
-AS_IF([test "x$libidn" = "xyes"],
-  [AC_CHECK_HEADERS([idn2.h],
-     [libidn_version="2"],
-     [AC_CHECK_HEADERS([idn2/idn2.h],
-                       [libidn_version="2"],
-                       [libidn_version="0"])])],
-  [LDFLAGS="-L$libidn/lib $LDFLAGS"
-   CPPFLAGS="-I$libidn/include $CPPFLAGS"
-   AC_CHECK_HEADERS([idn2.h],
-     [libidn_version="2"],
-     [AC_CHECK_HEADERS([idn2/idn2.h],
-                       [libidn_version="2"],
-                       [libidn_version="0"])])])
-
-AS_IF([test "x$libidn_version" = "x0"],
-  [AS_IF([test "x$libidn" = "xyes"],
-     [AC_CHECK_HEADERS([idna.h],
-        [libidn_version="1"],
-        [AC_CHECK_HEADERS([idn/idna.h],
-                          [libidn_version="1"]
-                          [libidn_version="2"])])],
-     [LDFLAGS="-L$libidn/lib $LDFLAGS"
-      CPPFLAGS="-I$libidn/include $CPPFLAGS"
-      AC_CHECK_HEADERS([idna.h],
-        [libidn_version="2"],
-        [AC_CHECK_HEADERS([idn/idna.h],
-                          [libidn_version="2"],
-                          [libidn_version="0"])])])])
-
-AS_IF([test "x$libidn_version" = "x0"],
-  [AC_MSG_ERROR([GNUnet requires libidn or libidn2])])
-
-AS_IF([test "x$libidn_version" = "x2"],
-  [AC_CHECK_LIB([idn2], [idn2_to_unicode_8z8z], [libidn_ok=yes], [libidn_ok=no])],
-  [AC_CHECK_LIB([idn], [idna_to_ascii_8z], [libidn_ok=yes], [libidn_ok=no])])
-
-AS_IF([test "x$libidn_ok" = "xno"],
-  [AC_MSG_ERROR([GNUnet requires libidn or libidn2])])
-
-AM_CONDITIONAL([HAVE_LIBIDN], [test "x$libidn_version" = "x1"])
-AM_CONDITIONAL([HAVE_LIBIDN2], [test "x$libidn_version" = "x2"])
-AS_IF([test "x$libidn_version" = "x2"],
-  [AC_DEFINE([HAVE_LIBIDN2], [1], [Define to 1 if libidn2 is available])],
-  [AC_DEFINE([HAVE_LIBIDN], [1], [Define to 1 if libidn is available])])
-
-# check for zlib
-AC_ARG_WITH([zlib],
-  [AS_HELP_STRING([--with-zlib=PFX], [base of zlib installation])],
-  [zlib=${withval}],
-  [zlib=yes])
-
-AS_IF([test "x$zlib" = "xno"], [AC_MSG_ERROR([GNUnet requires zlib])])
-
-AS_IF([test "x$zlib" = "xyes"],
-  [AC_CHECK_HEADER([zlib.h],
-     [AC_CHECK_LIB([z], [compress2], [zlib_ok=1], [zlib_ok=0])],
-     [zlib_ok=0])],
-  [LDFLAGS="-L$zlib/lib $LDFLAGS"
-   CPPFLAGS="-I$zlib/include $CPPFLAGS"
-   AC_CHECK_HEADER([zlib.h],
-     [AC_CHECK_LIB([z], [compress2], [zlib_ok=1], [zlib_ok=0])],
-     [zlib_ok=0])])
-
-AS_IF([test "x$zlib_ok" = "x0"], [AC_MSG_ERROR([GNUnet requires zlib])])
-AS_IF([test "x$zlib" = "xyes"],
-  [Z_CFLAGS=""
-   Z_LIBS="-lz"],
-  [Z_CFLAGS="-I${zlib}/include"
-   Z_LIBS="-L${zlib}/lib -lz"])
-AC_SUBST([Z_CFLAGS])
-AC_SUBST([Z_LIBS])
-
-AM_CONDITIONAL([HAVE_ZLIB], [test "x$zlib_ok" = "x1"])
-AC_DEFINE_UNQUOTED([HAVE_ZLIB], [$zlib_ok], [Define to 1 if zlib is available])
-
-# check for iconv
-AM_ICONV
-
-# check for 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],
-#   [AC_MSG_ERROR([GNUnet requires libunistring >= 0.9.1.1, found $LIBUNISTRING_VERSION])],
-#   [AC_MSG_ERROR([GNUnet requires libunistring >= 0.9.1.1, found $LIBUNISTRING_VERSION])])
-
-# check for sqlite
-CHECK_WITH_LIB([sqlite3], [sqlite3_open], [sqlite3.h], [HAVE_SQLITE])
-
-# check for postgres
-AX_LIB_POSTGRESQL([12.0], [postgres=1], [postgres=0])
-AS_IF([test "x$postgres" = "x1"],
-  [SAVE_CPPFLAGS="$CPPFLAGS"
-   CPPFLAGS="$POSTGRES_CPPFLAGS $CPPFLAGS"
-   AC_CHECK_HEADERS([libpq-fe.h], [postgres=1], [postgres=0])])
-AM_CONDITIONAL([HAVE_POSTGRESQL], [test "x$postgres" = "x1"])
-AC_DEFINE_UNQUOTED([HAVE_POSTGRESQL], [$postgres],
-                   [Define to 1 if Postgres is available])
-
-CPPFLAGS="$SAVE_CPPFLAGS"
-
-# check for libmicrohttpd
-AC_ARG_WITH([microhttpd],
-  [AS_HELP_STRING([--with-microhttpd=PFX],
-                  [base of libmicrohttpd installation])],
-  [SAVE_PKG_PATH="$PKG_CONFIG_PATH"
-   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_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 available])
-AM_CONDITIONAL([HAVE_REST], [true])
-
-
-# check for libmicrohttpd2
-AC_ARG_WITH([microhttpd2],
-  [AS_HELP_STRING([--with-microhttpd2=PFX],
-                  [base of libmicrohttpd2 installation])],
-  [SAVE_PKG_PATH="$PKG_CONFIG_PATH"
-   PKG_CONFIG_PATH="${withval}/lib/pkgconfig"
-   export PKG_CONFIG_PATH
-   PKG_CHECK_MODULES([MHD], [libmicrohttpd2 >= 2.0.0], [libmhd2=1], [libmhd2=0])
-   PKG_CONFIG_PATH="$SAVE_PKG_PATH"],
-  [PKG_CHECK_MODULES([MHD], [libmicrohttpd2 >= 2.0.0], [libmhd2=1], [libmhd2=0])])
-
-AM_CONDITIONAL([HAVE_MHD2], [test "x$libmhd2" = "x1"])
-AC_DEFINE_UNQUOTED([HAVE_MHD2], [$libmhd2],
-                   [Define to 1 if libmicrohttpd2 is available])
-
-
-# check for ngtcp2
-AC_ARG_WITH([ngtcp2],
-  [AS_HELP_STRING([--with-ngtcp2=PFX],
-                  [base of libngtcp2 installation])],
-  [SAVE_PKG_PATH="$PKG_CONFIG_PATH"
-   PKG_CONFIG_PATH="${withval}/lib/pkgconfig"
-   export PKG_CONFIG_PATH
-   PKG_CHECK_MODULES([NGTCP], [libngtcp2 >= 1.6.0], [libngtcp2=1], [libngtcp2=0])
-   PKG_CHECK_MODULES([NGTCP_CRYPTO], [libngtcp2_crypto_gnutls >= 1.6.0], [libngtcp2_crypto=1], [libngtcp2_crypto=0])
-   PKG_CONFIG_PATH="$SAVE_PKG_PATH"],
-  [PKG_CHECK_MODULES([NGTCP], [libngtcp2 >= 1.6.0], [libngtcp2=1], [libngtcp2=0])
-   PKG_CHECK_MODULES([NGTCP_CRYPTO], [libngtcp2_crypto_gnutls >= 1.6.0], [libngtcp2_crypto=1], [libngtcp2_crypto=0])
-  ])
-AC_ARG_WITH([nghttp3],
-  [AS_HELP_STRING([--with-nghttp3=PFX],
-                  [base of libnghttp3 installation])],
-  [SAVE_PKG_PATH="$PKG_CONFIG_PATH"
-   PKG_CONFIG_PATH="${withval}/lib/pkgconfig"
-   export PKG_CONFIG_PATH
-   PKG_CHECK_MODULES([NGHTTP], [libnghttp3 >= 1.4.0], [libnghttp3=1], [libnghttp3=0])
-   PKG_CONFIG_PATH="$SAVE_PKG_PATH"],
-  [PKG_CHECK_MODULES([NGHTTP], [libnghttp3 >= 1.4.0], [libnghttp3=1], [libnghttp3=0])])
-
-
-
-AM_CONDITIONAL([HAVE_NGHTTP], [test "x$libnghttp3" = "x1" && test "x$libngtcp2" = "x1" && test "x$libngtcp2_crypto" = "x1"])
-AC_DEFINE_UNQUOTED([HAVE_NGHTTP], [$libnghttp3],
-                   [Define to 1 if libnghttp3 is available])
-# check for gnutls
-AC_ARG_WITH([gnutls],
-  [AS_HELP_STRING([--with-gnutls=PFX], [base of gnutls installation])],
-  [AS_CASE([$with_gnutls],
-     [no],
-     [gnutls=0],
-     [yes],
-     [AC_CHECK_HEADERS([gnutls/abstract.h],
-        [AC_CHECK_LIB([gnutls], [gnutls_priority_set],
-                      [gnutls=1], [gnutls=0])],
-        [gnutls=0])
-      AC_CHECK_HEADERS([gnutls/dane.h],
-        [AC_CHECK_LIB([gnutls-dane], [dane_verify_crt_raw],
-                      [gnutls_dane=1], [gnutls_dane=0])],
-        [gnutls_dane=0])],
-     [LDFLAGS="-L$with_gnutls/lib $LDFLAGS"
-      CPPFLAGS="-I$with_gnutls/include $CPPFLAGS"
-      AC_CHECK_HEADERS([gnutls/abstract.h],
-        [AC_CHECK_LIB([gnutls], [gnutls_priority_set],
-                      [gnutls=1], [gnutls=0])],
-        [gnutls=0])
-      AC_CHECK_HEADERS([gnutls/dane.h],
-        [AC_CHECK_LIB([gnutls-dane], [dane_verify_crt_raw],
-                      [gnutls_dane=1], [gnutls_dane=0])],
-        [gnutls_dane=0])])],
-  [AC_CHECK_HEADERS([gnutls/abstract.h],
-        [AC_CHECK_LIB([gnutls], [gnutls_priority_set],
-                      [gnutls=1], [gnutls=0])],
-        [gnutls=0])
-      AC_CHECK_HEADERS([gnutls/dane.h],
-        [AC_CHECK_LIB([gnutls-dane], [dane_verify_crt_raw],
-                      [gnutls_dane=1], [gnutls_dane=0])],
-        [gnutls_dane=0])])
-AM_CONDITIONAL([HAVE_GNUTLS], [test "x$gnutls" = "x1"])
-AM_CONDITIONAL([HAVE_GNUTLS_DANE], [test "x$gnutls_dane" = "x1"])
-AC_DEFINE_UNQUOTED([HAVE_GNUTLS], [$gnutls], [Define to 1 if GnuTLS is available])
-AC_DEFINE_UNQUOTED([HAVE_GNUTLS_DANE], [$gnutls_dane],
-                   [Define to 1 if GnuTLS has DANE support])
-
-# restore LIBS
-LIBS=$SAVE_LIBS
-
-# Check for standard header files.
-AC_HEADER_DIRENT
-
-# Check for headers that are ALWAYS required
-# It's assumed that AC_INCLUDES_DEFAULT has been executed already, as that
-# makes sure the most common headers (e.g. stdlib.h) are available
-AC_CHECK_HEADERS([fcntl.h math.h errno.h ctype.h limits.h stdarg.h signal.h locale.h],
-  [],
-  [AC_MSG_ERROR([Compiling GNUnet requires standard UNIX header files])])
-
-# Check for headers required only on some systems or which are optional
-AC_CHECK_HEADERS([stdatomic.h 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 libintl.h netdb.h netinet/in.h sys/ioctl.h sys/socket.h sys/time.h sys/sysinfo.h sys/file.h sys/resource.h ifaddrs.h mach/mach.h sys/timeb.h argz.h ucred.h sys/ucred.h endian.h sys/endian.h execinfo.h byteswap.h])
-
-# Required for FreeBSD's netinet/in_systm.h and netinet/ip.h
-AS_IF([test "x$build_target" = "xfreebsd"],
-  [AC_CHECK_HEADERS([sys/types.h netinet/in_systm.h netinet/in.h, netinet/ip.h],
-     [], [],
-     [#ifdef HAVE_SYS_TYPES_H
-#include <sys/type.h>
-#endif
-#ifdef HAVE_NETINET_IN_SYSTM_H
-#include <netinet/in_systm.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-])])
-
-# check for gettext
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.21])
-
-# check for stantard typedefs, structures and compiler characteristics
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_TYPE_MODE_T
-
-AC_HEADER_STAT
-AC_HEADER_STDBOOL
-AC_STRUCT_TM
-
-AC_CHECK_MEMBER([struct sockaddr_in.sin_len],
-  [AC_DEFINE([HAVE_SOCKADDR_IN_SIN_LEN], [1],
-             [Define to 1 if struct sockaddr_in has sin_len field])],
-             [], [],
-             [#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>])
-
-AC_CHECK_MEMBER([struct sockaddr_un.sun_len],
-  [AC_DEFINE([HAVE_SOCKADDR_UN_SUN_LEN], [1],
-             [Define to 1 if struct sockaddr_un has sun_len field])],
-             [], [],
-             [#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>])
-
-AC_TYPE_OFF_T
-AC_TYPE_UID_T
-
-# check for library functions
-AC_FUNC_FORK
-AC_FUNC_CHOWN
-AC_CHECK_FUNCS([atoll stat64 strnlen mremap getrlimit setrlimit sysconf initgroups strndup gethostbyname2 getpeerucred getpeereid setresuid getifaddrs freeifaddrs getresgid mallinfo2 malloc_size malloc_usable_size getrusage random srandom stat statfs statvfs wait4 timegm pipe2 renameat2])
-
-GN_INTLINCL=""
-GN_LIBINTL="$LTLIBINTL"
-GN_LIB_LDFLAGS="-export-dynamic -no-undefined"
-GN_PLUGIN_LDFLAGS="-export-dynamic -avoid-version -module -no-undefined"
-
-AC_SUBST([GN_LIB_LDFLAGS])
-AC_SUBST([GN_PLUGIN_LDFLAGS])
-AC_SUBST([GN_INTLINCL])
-AC_SUBST([GN_LIBINTL])
-
-AC_SUBST([CPPFLAGS])
-AC_SUBST([LIBS])
-AC_SUBST([LDFLAGS])
-AC_SUBST([EXT_LIB_PATH])
-AC_SUBST([EXT_LIBS])
-
-AC_SUBST([LIBPREFIX])
-AC_SUBST([DLLDIR])
-AC_SUBST([EXT_LIB_PATH])
-
-DATAROOTDIR=$datarootdir
-AC_SUBST([DATAROOTDIR])
-
-# check for sudo
-AC_CHECK_PROGS([SUDO_BINARY], [sudo], [false])
-AM_CONDITIONAL([HAVE_SUDO], [test "x$SUDO_BINARY" != "xfalse"])
-
-# check for doas
-AC_CHECK_PROGS([DOAS_BINARY], [doas], [false])
-AM_CONDITIONAL([HAVE_DOAS_BINARY], [test "x$DOAS_BINARY" != "xfalse"])
-
-# check if NSE has to send timestamp information to testbed logger for
-# generating histogram of messages received
-AC_ARG_ENABLE([nse-histogram],
-  [AS_HELP_STRING([--enable-nse-histogram],
-                  [have NSE send timestamp information to testbed logger for generating a histogram of received messages. NOT useful for production (default is no)])],
-  [AS_IF([test "x$enableval" = "xno"]
-         [nse_histogram=0],
-         [nse_histogram=1])],
-  [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 information])
-
-# check if 'make check' should run tests
-AC_ARG_ENABLE([testruns],
-  [AS_HELP_STRING([--disable-testruns],
-                  [disable running tests on make check])],
-  [enable_testruns=${enableval}],
-  [enable_testruns=yes])
-AM_CONDITIONAL([ENABLE_TEST_RUN], [test "x$enable_testruns" = "xyes"])
-
-# check if benchmarks should be executed
-AC_ARG_ENABLE([benchmarks],
-  [AS_HELP_STRING([--enable-benchmarks],
-                  [enable benchmarking (default is no)])],
-  [enable_benchmarks=${enableval}],
-  [enable_benchmarks=no])
-
-AS_IF([test "x$enable_benchmarks" = "xyes"],
-  [AC_DEFINE([ENABLE_BENCHMARK], [1], [Define to 1 if benchmarks are enabled])])
-AM_CONDITIONAL([ENABLE_BENCHMARK], [test "x$enable_benchmarks" = "xyes"])
-AM_CONDITIONAL([HAVE_BENCHMARKS], [test "x$enable_benchmarks" = "xyes"])
-
-# check if experimental code should be compiled (or at least attempted to)
-AC_ARG_ENABLE([experimental],
-  [AS_HELP_STRING([--enable-experimental],
-                  [enable experimental code paths (default is no)])],
-  [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],
-  [AS_HELP_STRING([--enable-malicious],
-    [enable malicious code path (only for testing; default is no)])],
-  [AS_IF([test "x$enableval" = "xno"],
-         [malicious=0],
-         [malicious=1])],
-  [malicious=0
-   enable_malicious=no])
-AM_CONDITIONAL([ENABLE_MALICIOUS], [test "x$malicious" = "x1"])
-AC_DEFINE_UNQUOTED([ENABLE_MALICIOUS], [$malicious],
-                   [Define to 1 if malicious code paths should be compiled])
-
-# check if services should be started on demand when needed
-# Some services may choose to never start by default
-# and it is up to the service/module developer to decide
-# by having "START_ON_DEMAND = NO" instead of
-# "START_ON_DEMAND = @START_ON_DEMAND@"
-# in the service/module's conf.in file.
-# See also IMMEDIATE_START for an unconditional immediate start.
-AC_ARG_ENABLE([autostart],
-  [AS_HELP_STRING([--disable-autostart],
-                  [do not start peer services by default])],
-  [AS_IF([test "x$enableval" = "xno"],
-         [START_ON_DEMAND=NO],
-         [START_ON_DEMAND=YES])],
-  [START_ON_DEMAND=YES])
-AC_SUBST([START_ON_DEMAND])
-
-# check if memory statistics should be kept (very expensive CPU-wise!)
-AC_ARG_ENABLE([heapstats],
-  [AS_HELP_STRING([--enable-heapstats], [enable expensive heap statistics])],
-  [AS_IF([test "x$enableval" = "xno"],
-         [enable_heapstats=0],
-         [enable_heapstats=1])],
-  [enable_heapstats=0])
-AC_DEFINE_UNQUOTED([ENABLE_HEAP_STATISTICS], [$enable_heapstats],
-                   [Define to 1 if expensive heap statistics should be enabled])
-
-# check if the __thread storage class is available
-AC_MSG_CHECKING([if __thread is supported])
-AC_LINK_IFELSE(
-  [AC_LANG_PROGRAM([#include <stdlib.h>
-#undef __thread
-static __thread int a = 1;],
-[exit(a-1);])],
-  [have_thread_local=1],
-  [have_thread_local=0])
-AC_DEFINE_UNQUOTED([HAVE_THREAD_LOCAL_GCC], [$have_thread_local],
-                   [Define to 1 if __thread is supported])
-AS_IF([test "x$have_thread_local" = "x1"],
-  [AC_MSG_RESULT([yes])],
-  [AC_MSG_RESULT([no])])
-
-# check if gcov should be used
-AC_ARG_ENABLE([coverage],
-  [AS_HELP_STRING([--enable-coverage],
-                  [compile the library with code coverage support])],
-  [use_gcov=${enableval}],
-  [use_gcov=no])
-AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"])
-
-# Temporarily disable a specific piece of code until TNG is out.
-AC_ARG_ENABLE([transport-timing-diagnostic],
-  [AS_HELP_STRING([--enable-transport-timing-diagnostic],
-                  [enable logging of transport (not TNG) sending times])],
-  [enable_ttd=yes],
-  [enable_ttd=no])
-AS_IF([test "x$enable_ttd" = "xyes"],
-  [AC_DEFINE([ENABLE_TTD], [1],
-             [Define if transport (not TNG) should warn about sending times.])])
-
-# get version information
-AC_PATH_PROG([gitcommand], [git])
-AC_MSG_CHECKING([if source is under a VCS])
-AS_IF([test "x$gitcommand" = "x"],
-  [vcs_name="no"
-   vcs_version="\"release\""],
-  [AS_IF([test -d .git], dnl admittedly, not the best
-     [git_version=$(cd $srcdir; git log -n1 --abbrev-commit | head -n1 | cut -d ' ' -f2 2>/dev/null)
-      vcs_name='yes, git-svn'
-      vcs_version="\"git-$git_version\""],
-     [vcs_name="no"
-      vcs_version="\"release\""])])
-AC_MSG_RESULT([$vcs_name])
-AC_DEFINE_UNQUOTED([VCS_VERSION], [$vcs_version],
-                   [VCS revision/hash or tarball version])
-
-AC_CONFIG_FILES([
-Makefile
-contrib/Makefile
-data/Makefile
-data/hellos/Makefile
-scripts/Makefile
-contrib/services/Makefile
-contrib/services/openrc/Makefile
-contrib/services/systemd/Makefile
-contrib/scripts/Makefile
-contrib/scripts/gnunet-logread/Makefile
-doc/Makefile
-doc/man/Makefile
-doc/doxygen/Makefile
-m4/Makefile
-po/Makefile.in
-src/Makefile
-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/mhd/Makefile
-src/lib/pq/Makefile
-src/lib/sq/Makefile
-src/lib/testing/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/pils/Makefile
-src/service/pils/pils.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/testbed/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/hello/Makefile
-src/cli/identity/Makefile
-src/cli/messenger/Makefile
-src/cli/namecache/Makefile
-src/cli/namestore/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/include/gnunet_config.h
-pkgconfig/Makefile
-pkgconfig/gnunetarm.pc
-pkgconfig/gnunetblock.pc
-pkgconfig/gnunetcadet.pc
-pkgconfig/gnunetconsensus.pc
-pkgconfig/gnunetconversation.pc
-pkgconfig/gnunetcore.pc
-pkgconfig/gnunetdatacache.pc
-pkgconfig/gnunetdatastore.pc
-pkgconfig/gnunetdht.pc
-pkgconfig/gnunetdns.pc
-pkgconfig/gnunetfs.pc
-pkgconfig/gnunetgns.pc
-pkgconfig/gnunetgnsrecord.pc
-pkgconfig/gnunethello.pc
-pkgconfig/gnunetidentity.pc
-pkgconfig/gnunetjson.pc
-pkgconfig/gnunetmhd.pc
-pkgconfig/gnunetmessenger.pc
-pkgconfig/gnunetmicrophone.pc
-pkgconfig/gnunetnamestore.pc
-pkgconfig/gnunetnat.pc
-pkgconfig/gnunetnse.pc
-pkgconfig/gnunetpq.pc
-pkgconfig/gnunetreclaim.pc
-pkgconfig/gnunetregex.pc
-pkgconfig/gnunetrevocation.pc
-pkgconfig/gnunetrps.pc
-pkgconfig/gnunetscalarproduct.pc
-pkgconfig/gnunetset.pc
-pkgconfig/gnunetspeaker.pc
-pkgconfig/gnunetstatistics.pc
-pkgconfig/gnunettesting.pc
-pkgconfig/gnunettransport.pc
-pkgconfig/gnunetutil.pc
-pkgconfig/gnunetvpn.pc
-])
-
-AC_OUTPUT
-
-# notice about Java ports
-AS_IF([test "x$enable_java_ports" = "xyes"],
-  [AC_MSG_NOTICE([Opening TCP ports to enable gnunet-java bindings])
-   java_msg="yes"],
-  [java_msg="no"])
-
-# experimental code is enabled
-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" = "x1"],
-  [transport_msg="tcp udp unix http wlan"])
-
-# libidn version
-AS_IF([test "x$libidn_version" = "x2"],
-  [libidn_msg="libidn2"],
-  [libidn_msg="libidn"])
-
-# mandoc
-AS_IF([test "x$MANDOC_BINARY" = "xfalse"],
-  [mandoc_msg="no"],
-  [mandoc_msg="yes"])
-
-# doxy
-AS_IF([$DOXY_BINARY],
-  [doxy_msg="yes"],
-  [doxy_msg="no"])
-
-# conversation
-conversation_msg="no"
-AS_IF([test "x$pulse" = "x1"],
-  [libpulse_msg="yes"],
-  [libpulse_msg="no"])
-AS_IF([test "x$opus" = "x1"],
-  [libopus_msg="yes"],
-  [libopus_msg="no"])
-gstreamer_msg="no"
-AS_IF([test "x$conversation_backend" = "xnone"],
-  [AS_IF([test "x$pulse" != "x1"],
-     [libpulse_msg="no (required to build conversation)"],
-     [libpulse_msg="yes"])
-   AS_IF([test "x$opus" != "x1"],
-     [libopus_msg="no (required to build conversation)"],
-     [libopus_msg="yes"])
-   AS_IF([test "x$gst" != "x1"],
-     [gstreamer_msg="no (required to build conversation)"],
-     [gstreamer_msg="yes"])],
-  [AS_IF([test "x$opus" = "x1"],
-     [conversation_msg="yes ($conversation_backend)"],
-     [conversation_msg="no"])])
-
-# default network interface
-interface_msg=$(echo "$DEFAULT_INTERFACE" | tr -d \")
-
-# libextractor
-AS_IF([test "x$extractor" = "x0"],
-  [libextractor_msg="no"
-   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"],
-  [libzbar_msg="no"])
-
-# libpng
-AS_IF([test "x$png" = "x1"],
-  [libpng_msg="yes"],
-  [libpng_msg="no"])
-
-AS_IF([test "x$curl_gnutls" = "x0"],
-       [curl_tls_backend="OpenSSL"],
-       [curl_tls_backend="GnuTLS"])
-
-# ifconfig
-AS_IF([test "x$IFCONFIG_BINARY" = "xfalse"],
-  [ifconfig_msg="no (some features might not work)"],
-  [ifconfig_msg="yes"])
-
-# upnpc
-AS_IF([test "x$UPNPC_BINARY" = "xfalse"],
-  [upnpc_msg="no (NAT traversal might not work)"],
-  [upnpc_msg="yes"])
-
-# iptables
-AS_IF([test "x$IPTABLES_BINARY" = "xfalse"],
-  [iptables_msg="no (DNS query interception might not work)"],
-  [iptables_msg="yes"])
-
-# bluetooth
-AS_IF([test "x$bluetooth" = "x0"],
-  [bluetooth_msg="no"],
-  [bluetooth_msg="yes"])
-
-# gnutls
-AS_IF([test "x$gnutls" = "x0"],
-  [gnutls_msg="no"],
-  [AS_IF([test "x$gnutls_dane" = "x0"],
-     [gnutls_msg="yes (without DANE support)"
-      AC_MSG_WARN([GnuTLS lacks DANE support; validation using it will not be possible])],
-     [gnutls_msg="yes (with DANE support)"])])
-
-# pdflatex
-AS_IF([test "x$PDFLATEX_BINARY" = "xfalse"],
-  [latex_msg="no"],
-  [latex_msg="yes"])
-
-# database backends
-features_msg=""
-
-AS_IF([test "x$sqlite3" = "x1"],
-  [sqlite_msg="yes"
-   features_msg="sqlite $features_msg"],
-  [sqlite_msg="no"])
-
-AS_IF([test "x$postgres" = "x1"],
-  [postgres_msg="yes"
-   features_msg="postgres $features_msg"],
-  [postgres_msg="no"])
-
-# Too new versions of Python might cause compatibility issues, so output a
-# warning when the version found goes above the recommended maximum version.
-AS_VERSION_COMPARE([$PYTHON_VERSION],[3.8],[],[],
-  [AC_MSG_WARN([Your version of Python is not supported, you might see issues])])
-
-AC_MSG_NOTICE([
-Detected system
-===============
-
-GNUnet version:                 ${VERSION}
-
-Host Setup:                     ${host}
-Install Prefix:                 ${prefix}
-Compiler:                       ${CC}
-CFLAGS:                         ${CFLAGS}
-CPPFLAGS:                       ${CPPFLAGS}
-LDFLAGS:                        ${LDFLAGS}
-LIBS:                           ${LIBS}
-Build Target:                   ${build_target}
-
-Default Interface:              ${interface_msg}
-
-sqlite3:                        ${sqlite_msg}
-PostgreSQL:                     ${postgres_msg}
-
-cURL TLS backend:               ${curl_tls_backend}
-Bluetooth:                      ${bluetooth_msg}
-iptables:                       ${iptables_msg}
-ifconfig:                       ${ifconfig_msg}
-UPnPc:                          ${upnpc_msg}
-GnuTLS:                         ${gnutls_msg}
-
-LaTeX:                          ${latex_msg}
-
-libextractor:                   ${libextractor_msg}
-libzbar:                        ${libzbar_msg}
-libpng:                         ${libpng_msg}
-libidn:                         ${libidn_msg}
-libopus:                        ${libopus_msg}
-libpulse:                       ${libpulse_msg}
-gstreamer:                      ${gstreamer_msg}
-
-Java:                           ${java_msg}
-
-doxygen:                        ${doxy_msg}
-mandoc:                         ${mandoc_msg}
-
-GNUnet configuration
-====================
-
-Transports:                     ${transport_msg}
-Conversation:                   ${conversation_msg}
-Database Backends               ${features_msg}
-Experimental Code:              ${experimental_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 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
-# adduser --system --disabled-login --home /var/lib/gnunet gnunet
-])])
-   AC_MSG_WARN([Each user of GNUnet should be added to the 'gnunet' group])
-   AS_IF([test "x$HAVE_GNUNET_USER" != "x0"],
-     [AC_MSG_NOTICE([To do this on this system, run:
-# adduser USERNAME gnunet
-for each of your users, replacing 'USERNAME' with the respective login name.
-Users may have to login again for the changes to take effect.])])])
-
-AC_MSG_NOTICE([For detailed setup instructions, type 'info gnunet' after the installation or visit https://docs.gnunet.org/])
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
@@ -1,236 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
-
-SUBDIRS = scripts services
-
-include Makefile.inc
-
-INITD_FILES = \
-  services/systemd/gnunet-user.service \
-  services/systemd/sysusers-gnunet.conf \
-  services/systemd/gnunet.service \
-  services/systemd/tmpfiles-gnunet.conf \
-  services/openrc/gnunet.initd
-
-PACKAGES_FILES = \
-	packages/fedora/10-dns2gns.sh \
-	packages/fedora/gnunet-system.conf \
-	packages/fedora/gnunet.service \
-	packages/fedora/gnunet-user.service \
-  packages/alpine/gnunet-gtk/APKBUILD \
-  packages/alpine/gnurl/APKBUILD \
-  packages/alpine/gnunet/gnunet-user-services.initd \
-  packages/alpine/gnunet/gnunet.pre-deinstall \
-  packages/alpine/gnunet/gnunet-user.conf \
-  packages/alpine/gnunet/gnunet.xsession \
-  packages/alpine/gnunet/gnunet-system.conf \
-  packages/alpine/gnunet/APKBUILD \
-  packages/alpine/gnunet/gnunet.post-install \
-  packages/alpine/gnunet/gnunet.pre-install \
-  packages/alpine/gnunet/gnunet-system-services.initd \
-  packages/alpine/gnunet/gnunet-gns-proxy.initd \
-  packages/arch/gnunet-git/gnunet.install \
-  packages/arch/gnunet-git/gnunet-system.service \
-  packages/arch/gnunet-git/gnunet.sysusers \
-  packages/arch/gnunet-git/gnunet.tmpfiles \
-  packages/arch/gnunet-git/gnunet-user.conf \
-  packages/arch/gnunet-git/gnunet-user.service \
-  packages/arch/gnunet-git/PKGBUILD \
-  packages/arch/gnunet-git/.SRCINFO \
-  packages/arch/gnunet/gnunet.install \
-  packages/arch/gnunet/gnunet-system.service \
-  packages/arch/gnunet/gnunet.sysusers \
-  packages/arch/gnunet/gnunet.tmpfiles \
-  packages/arch/gnunet/gnunet-user.conf \
-  packages/arch/gnunet/gnunet-user.service \
-  packages/arch/gnunet/PKGBUILD \
-  packages/arch/gnunet/.SRCINFO \
-  packages/guix/guix-env-py2.scm \
-  packages/guix/guix-env-gillmann.scm \
-  packages/guix/notest-guix-env.scm \
-  packages/homebrew/gnunet.rb \
-  packages/nix/gnunet-dev.nix \
-  packages/nix/default.nix
-
-EXTRA_DIST = \
-  sounds/vonlynX-bdbAm-lo.wav \
-  sounds/vonlynX-bdbG9-lo.wav \
-  sounds/vonlynX-ringtones.txt \
-  A-Z.ecc \
-  xdg-scheme-handler/README.md \
-  apparmor/gnunet-daemon-testbed-blacklist \
-  apparmor/gnunet-service-identity \
-  apparmor/gnunet-cadet \
-  apparmor/gnunet-service-core \
-  apparmor/gnunet-identity \
-  apparmor/gnunet-service-cadet \
-  apparmor/gnunet-service-dns \
-  apparmor/gnunet-template \
-  apparmor/gnunet-service-peerstore \
-  apparmor/gnunet-nse \
-  apparmor/gnunet-helper-transport-wlan \
-  apparmor/gnunet-service-set \
-  apparmor/gnunet-uri \
-  apparmor/gnunet-conversation \
-  apparmor/usr.bin.gnunet-helper-nat-server \
-  apparmor/gnunet-transport \
-  apparmor/gnunet-service-nse \
-  apparmor/gnunet-transport-certificate-creation \
-  apparmor/gnunet-daemon-hostlist \
-  apparmor/gnunet-unindex \
-  apparmor/gnunet-nat-server \
-  apparmor/gnunet-setup \
-  apparmor/gnunet-service-testbed \
-  apparmor/gnunet-gtk \
-  apparmor/gnunet-scalarproduct \
-  apparmor/gnunet-statistics \
-  apparmor/gnunet-helper-testbed \
-  apparmor/gnunet-scrypt \
-  apparmor/gnunet-conversation-test \
-  apparmor/gnunet-publish \
-  apparmor/gnunet-helper-audio-playback \
-  apparmor/gnunet-revocation \
-  apparmor/gnunet-helper-vpn \
-  apparmor/gnunet-auto-share \
-  apparmor/gnunet-service-scalarproduct-alice \
-  apparmor/gnunet-service-template \
-  apparmor/gnunet-arm \
-  apparmor/gnunet-search \
-  apparmor/gnunet-ecc \
-  apparmor/gnunet-download-manager.scm \
-  apparmor/gnunet-service-revocation \
-  apparmor/gnunet-gns-proxy-setup-ca \
-  apparmor/gnunet-service-mesh \
-  apparmor/gnunet-helper-transport-wlan-dummy \
-  apparmor/gnunet-service-conversation \
-  apparmor/gnunet-fs \
-  apparmor/gnunet-statistics-gtk \
-  apparmor/gnunet-service-regex \
-  apparmor/gnunet-helper-transport-bluetooth \
-  apparmor/gnunet-service-resolver \
-  apparmor/gnunet-service-fs \
-  apparmor/gnunet-helper-nat-client \
-  apparmor/gnunet-service-arm \
-  apparmor/gnunet-peerinfo-gtk \
-  apparmor/gnunet-vpn \
-  apparmor/gnunet-helper-exit \
-  apparmor/gnunet-set-profiler \
-  apparmor/gnunet-helper-fs-publish \
-  apparmor/gnunet-service-gns \
-  apparmor/gnunet-service-datastore \
-  apparmor/gnunet-service-namestore \
-  apparmor/gnunet-service-dht \
-  apparmor/gnunet-config \
-  apparmor/gnunet-testbed-profiler \
-  apparmor/gnunet-daemon-pt \
-  apparmor/gnunet-peerinfo \
-  apparmor/gnunet-service-ats \
-  apparmor/gnunet-helper-audio-record \
-  apparmor/gnunet-directory \
-  apparmor/gnunet-download \
-  apparmor/gnunet-fs-gtk \
-  apparmor/tunables/gnunet \
-  apparmor/gnunet-ats \
-  apparmor/gnunet-set-ibf-profiler \
-  apparmor/gnunet-dns2gns \
-  apparmor/gnunet-service-peerinfo \
-  apparmor/gnunet-service-namecache \
-  apparmor/gnunet-daemon-exit \
-  apparmor/gnunet-resolver \
-  apparmor/gnunet-bcd \
-  apparmor/gnunet-daemon-regexprofiler \
-  apparmor/gnunet-namestore \
-  apparmor/gnunet-namestore-gtk \
-  apparmor/gnunet-service-testbed-logger \
-  apparmor/gnunet-peerstore \
-  apparmor/gnunet-core \
-  apparmor/gnunet-gns-import.sh \
-  apparmor/gnunet-gns-proxy \
-  apparmor/gnunet-identity-gtk \
-  apparmor/gnunet-service-vpn \
-  apparmor/gnunet-daemon-testbed-underlay \
-  apparmor/gnunet-qr \
-  apparmor/gnunet-datastore \
-  apparmor/gnunet-service-statistics \
-  apparmor/gnunet-conversation-gtk \
-  apparmor/gnunet-daemon-latency-logger \
-  apparmor/gnunet-testing \
-  apparmor/gnunet-namecache \
-  apparmor/gnunet-service-transport \
-  apparmor/gnunet-daemon-topology \
-  apparmor/gnunet-helper-dns \
-  apparmor/gnunet-gns \
-  apparmor/gnunet-helper-nat-server \
-  apparmor/abstractions/gnunet-test \
-  apparmor/abstractions/gnunet-db \
-  apparmor/abstractions/gnunet-gtk \
-  apparmor/abstractions/gnunet-common \
-  apparmor/abstractions/gnunet-suid \
-  apparmor/abstractions/gnunet-sgid \
-  apparmor/gnunet-service-scalarproduct-bob \
-  conf/uncrustify.cfg \
-  conf/tox.ini \
-  conf/wireshark/wireshark.lua \
-  conf/.style.yapf \
-  conf/editors/eclipse/gnunet_codingstyle.xml \
-  conf/editors/clang-format \
-  conf/uncrustify_precommit \
-  conf/gnunet/gnunet-user.conf \
-  conf/gnunet/no_autostart_above_core.conf \
-  conf/gnunet/gnunet-system.conf \
-  conf/gnunet/no_forcestart.conf \
-  conf/colorit/colorit.conf \
-  conf/nss/nssswitch.conf \
-  testbed_configs/testbed_cluster.conf \
-  testbed_configs/testbed_supermuc.conf \
-  packages/guix/guix.README \
-  web/log.php \
-  ci/buildbot/ssh-keys \
-  ci/buildbot/ssh-config \
-  docker/docker-entrypoint.sh \
-  docker/Dockerfile \
-  docker/README.md \
-  benchmark/collect.awk \
-  packages/guix/guix.scm \
-  Makefile.inc \
-  vagrant/Vagrantfile \
-  vagrant/bootstrap.ubuntu.sh \
-  privacy-sensitive-symbols.mspec \
-  gnunet-arch-full.svg \
-  patches/texi2html5-indent.diff \
-  patches/transport_ats_years.diff \
-  patches/lrn-indent.diff \
-  test_gnunet_prefix.c \
-  $(PACKAGES_FILES) \
-  $(INITD_FILES)
-
-check_PROGRAMS = \
-  test_gnunet_prefix
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = \
-  $(check_PROGRAMS)
-endif
-
-test_gnunet_prefix_SOURCES = \
-  test_gnunet_prefix.c
-
-test_gnunet_prefix_CPPFLAGS = \
-  $(LTDLINCL) $(AM_CPPFLAGS)
-
-test_gnunet_prefix_LDADD = \
-  $(GCLIBADD) $(WINLIB) \
-  $(LTLIBICONV) \
-  $(GN_LIBINTL) \
-  $(LIBLTDL) -lunistring $(XLIB)
-
-aclocaldir = $(datadir)/aclocal
-dist_aclocal_DATA = \
-  gnunet.m4
-
-xdgdeentrydir = $(datadir)/applications
-dist_xdgdeentry_DATA = \
-  xdg-scheme-handler/gnunet-uri.desktop
-
-## EOF
diff --git a/contrib/scripts/Makefile.am b/contrib/scripts/Makefile.am
@@ -1,82 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
-libexecdir= $(pkglibdir)/libexec/
-
-SUBDIRS = gnunet-logread
-
-# FIXME: read into AWK_SCRIPTS autotools builtin.
-if HAVE_AWK
-awkSCRIPTS = \
-  check-texinfo.awk
-else
-awkSCRIPTS =
-endif
-
-noinst_SCRIPTS = \
-  terminate.py \
-  pydiffer.py \
-  removetrailingwhitespace.py \
-  gnunet_pyexpect.py \
-  gnunet_janitor.py \
-  gnunet-chk.py \
-  $(awkSCRIPTS)
-
-bin_SCRIPTS = \
-  gnunet-bugreport
-
-# This script is not documented and its usage is quite uncommon.
-libexec_SCRIPTS = \
-  gnunet-suidfix
-
-EXTRA_DIST = \
-  coverage.sh \
-  terminate.py.in \
-  gnunet_pyexpect.py.in \
-  gnunet_janitor.py.in \
-  gnunet-chk.py.in \
-  removetrailingwhitespace.py.in \
-  pydiffer.py.in \
-  check-texinfo.awk.in \
-  build-install-gnunet-debian10.sh \
-  process_log.sh \
-  generate-monkey-db.sh \
-  find_typedefs.py \
-  pydmesg \
-  visualize_stats.sh \
-  debug \
-  build_cscope.sh \
-  lint/lint-man.sh \
-  lint/lint-python.sh \
-  revisionary.sh \
-  regression.sh \
-  doc/texinfo-hacks.el \
-  afferify \
-  zonewalk-to-types.sh \
-  gdb-iterate-dll.py \
-  $(SCRIPTS)
-
-
-CLEANFILES = \
-  $(noinst_SCRIPTS)
-
-# Use SUFFIX Extension rules, they are more portable for every
-# implementation of 'make'.
-# You'll also run into the "'%' is a GNU make extension warning"
-# if you use this:
-#
-#%.py: %.py.in Makefile
-#	$(do_subst) < $< > $@
-#	chmod +x $@
-#
-# instead of this:
-SUFFIXES = .py.in .py
-
-.py.in.py:
-	$(AWK) -v py="$(PYTHON)" -f $(top_srcdir)/scripts/dosubst.awk < $< > $@
-	chmod +x $@
-
-if HAVE_AWK
-check-texinfo.awk: check-texinfo.awk.in Makefile
-	$(AWK) -v awkay="$(AWK_BINARY)" -f $(top_srcdir)/scripts/dosubst.awk < $(srcdir)/check-texinfo.awk.in > check-texinfo.awk
-	chmod +x check-texinfo.awk
-endif
diff --git a/contrib/scripts/gnunet-logread/Makefile.am b/contrib/scripts/gnunet-logread/Makefile.am
@@ -1,33 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
-
-SUFFIXES = .in
-
-gnunet-logread: gnunet-logread.in Makefile
-	$(AWK) -v prl="$(PERL)" -v pfx="$(prefix)" -f $(top_srcdir)/scripts/dosubst.awk < $(srcdir)/gnunet-logread.in > gnunet-logread
-	chmod +x gnunet-logread
-
-gnunet-logread-ipc-sdedit: gnunet-logread-ipc-sdedit.in Makefile
-	$(AWK) -v prl="$(PERL)" -f $(top_srcdir)/scripts/dosubst.awk < $(srcdir)/gnunet-logread-ipc-sdedit.in > gnunet-logread-ipc-sdedit
-	chmod +x gnunet-logread-ipc-sdedit
-
-CLEANFILES=	\
-		gnunet-logread \
-		gnunet-logread-ipc-sdedit
-
-if GNUNET_LOGREAD
-if HAVE_PERL
-bin_SCRIPTS = \
-		gnunet-logread-ipc \
-		$(CLEANFILES)
-else
-noinst_SCRIPTS =		\
-		gnunet-logread-ipc \
-		$(CLEANFILES)
-endif
-endif
-
-EXTRA_DIST = \
-  gnunet-logread.in \
-  gnunet-logread-ipc-sdedit.in \
-  gnunet-logread-ipc
diff --git a/contrib/services/Makefile.am b/contrib/services/Makefile.am
@@ -1 +0,0 @@
-SUBDIRS = openrc systemd
diff --git a/contrib/services/openrc/Makefile.am b/contrib/services/openrc/Makefile.am
@@ -1,7 +0,0 @@
-pkginitdir= $(pkgdatadir)/services/openrc
-
-pkginit_DATA = \
-  gnunet.initd
-
-EXTRA_DIST = \
-  $(pkginit_DATA)
diff --git a/contrib/services/systemd/Makefile.am b/contrib/services/systemd/Makefile.am
@@ -1,10 +0,0 @@
-pkginitdir= $(pkgdatadir)/services/systemd
-
-pkginit_DATA = \
-  gnunet.service \
-  gnunet-user.service \
-  sysusers-gnunet.conf \
-  tmpfiles-gnunet.conf
-
-EXTRA_DIST = \
-  $(pkginit_DATA)
diff --git a/data/Makefile.am b/data/Makefile.am
@@ -1,22 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
-
-SUBDIRS = hellos
-
-dist_pkgdata_DATA = \
-  gns/def.tex \
-  gns/gns-bcd.html \
-  gns/gns-bcd.tex \
-  gns/gns-bcd-forbidden.html \
-  gns/gns-bcd-internal-error.html \
-  gns/gns-bcd-invalid-key.html \
-  gns/gns-bcd-not-found.html \
-  gns/gns-bcd-png.tex \
-  gns/gns-bcd-simple.html \
-  gns/gns-bcd-simple.tex \
-  branding/logo/gnunet-logo.png \
-  branding/logo/gnunet-logo-dark-text.svg \
-  branding/logo/gnunet-logo-dark-only-text.svg \
-  testing_hostkeys.ecc
-
-## EOF
diff --git a/data/hellos/Makefile.am b/data/hellos/Makefile.am
@@ -1,6 +0,0 @@
-pkghellodir= $(pkgdatadir)/hellos
-
-pkghello_DATA = \
-  GKZSYTE4H3N4RMYGFYEM95RV1CDRPH8QNJNTPMEB7C4QJGGR3KEG
-
-EXTRA_DIST = $(pkghello_DATA)
diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -1,37 +0,0 @@
-# This Makefile.am is in the public domain
-
-SUBDIRS = .
-
-if HAVE_DOXY_BINARY
-  SUBDIRS += doxygen
-endif
-
-# OpenBSD is a bit iffy wrt sphinx make info
-if OPENBSD
-all-local:
-	cd handbook/texinfo && make || touch gnunet.info
-GNUNET_TEXI =
-else
-GNUNET_TEXI = handbook/texinfo/gnunet.texi
-endif
-
-install-data-hook:
-	mkdir -p $(DESTDIR)$(docdir)
-	cp -pr handbook/html $(DESTDIR)$(docdir)
-	mkdir -p $(DESTDIR)$(infodir)
-	cp -pr handbook/texinfo/gnunet.info $(DESTDIR)$(infodir)
-
-if INCLUDE_MANPAGES
-SUBDIRS += man
-endif
-
-AM_MAKEINFOFLAGS = --no-headers --no-split
-
-info_TEXINFOS = \
-  $(GNUNET_TEXI)
-
-EXTRA_DIST = \
-	handbook/texinfo \
-	system_specific/outdated-and-old-installation-instructions.txt \
-	system_specific/FROM_SOURCE \
-	handbook/html
diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
@@ -1,21 +0,0 @@
-# This Makefile.am is in the public domain
-all:
-	@echo -e \
-"Generate documentation:\n" \
-"\tmake full - full documentation with dependency graphs (slow)\n" \
-"\tmake fast - fast mode without dependency graphs"
-
-full: gnunet.doxy
-	python -c "f=open('../../.version'); print(f'PROJECT_NUMBER = {f.read().split(\"-\")[0]}'); f.close()" > version.doxy
-	doxygen $<
-
-fast: gnunet.doxy
-	python -c "f=open('../../.version'); print(f'PROJECT_NUMBER = {f.read().split(\"-\")[0]}'); f.close()" > version.doxy
-	sed 's/\(HAVE_DOT.*=\).*/\1 NO/' $< | doxygen -
-
-clean:
-	rm -rf html
-	rm -rf xml
-
-EXTRA_DIST = \
-   gnunet.doxy
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
@@ -1,97 +0,0 @@
-# This Makefile.am is in the public domain
-
-gnunet.conf.5: gnunet.conf.5.in Makefile
-	$(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/scripts/dosubst.awk < $(srcdir)/gnunet.conf.5.in > $(srcdir)/gnunet.conf.5
-
-CLEANFILES = gnunet.conf.5
-
-if HAVE_EXPERIMENTAL
-if HAVE_MANDOC
-# After I went through the alternatives with the focus
-# on staying as portable as possible to other make
-# implementations, I have to face the fact after hours
-# that this is the most portable way to achieve what
-# I want and that the alternatives are depressing and
-# nonfunctional.
-produce_html.sh: produce_html.sh.in Makefile
-	$(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/scripts/dosubst.awk < $(srcdir)/produce_html.sh.in > produce_html.sh
-	@chmod +x produce_html.sh
-
-CLEANFILES += produce_html.sh
-
-.PHONY: man-html
-man-html: produce_html.sh
-	$(SH) $(srcdir)/produce_html.sh
-
-htmldocdir = $(datadir)/doc/gnunet/manhtml/
-.PHONY: man-html-install
-man-html-install:
-	@mkdir -p $(htmldocdir)
-	@mv $(srcdir)/*.html $(htmldocdir)
-man-html-uninstall:
-	@rm $(htmldocdir)/*.html
-
-CLEANFILES += *.html
-endif
-endif
-
-man_MANS = \
-  gnunet.conf.5 \
-  gnunet-arm.1 \
-  gnunet-auto-share.1 \
-  gnunet-base32.1 \
-  gnunet-bcd.1 \
-  gnunet-bugreport.1 \
-  gnunet-config.1 \
-  gnunet-core.1 \
-  gnunet-conversation.1 \
-  gnunet-conversation-test.1 \
-  gnunet-dht-get.1 \
-  gnunet-dht-put.1 \
-  gnunet-dht-monitor.1 \
-  gnunet-dht-hello.1 \
-  gnunet-directory.1 \
-  gnunet-dns2gns.1 \
-  gnunet-datastore.1 \
-  gnunet-download.1 \
-  gnunet-did.1 \
-  gnunet-ecc.1 \
-  gnunet-fs.1 \
-  gnunet-gns.1 \
-  gnunet-gns-proxy.1 \
-  gnunet-gns-proxy-setup-ca.1 \
-  gnunet-hello.1 \
-  gnunet-identity.1 \
-  gnunet-cadet.1 \
-  gnunet-messenger.1 \
-  gnunet-namecache.1 \
-  gnunet-namestore.1 \
-  gnunet-namestore-dbtool.1 \
-  gnunet-namestore-zonefile.1 \
-  gnunet-nat.1 \
-  gnunet-nat-auto.1 \
-  gnunet-nat-server.1 \
-  gnunet-nse.1 \
-  gnunet-publish.1 \
-  gnunet-qr.1 \
-  gnunet-reclaim.1 \
-  gnunet-resolver.1 \
-  gnunet-revocation.1 \
-  gnunet-scalarproduct.1 \
-  gnunet-scrypt.1 \
-  gnunet-search.1 \
-  gnunet-statistics.1 \
-  gnunet-testing.1 \
-  gnunet-testing-run-service.1 \
-  gnunet-timeout.1 \
-  gnunet-transport.1 \
-  gnunet-transport-certificate-creation.1 \
-  gnunet-unindex.1 \
-  gnunet-uri.1 \
-  gnunet-vpn.1 \
-  gnunet-zoneimport.1
-
-EXTRA_DIST = ${man_MANS} \
- gnunet.conf.5.in \
- produce_html.sh.in \
- README
diff --git a/doc/old/handbook/Makefile.am b/doc/old/handbook/Makefile.am
@@ -1,143 +0,0 @@
-# This Makefile.am is in the public domain
-docdir = $(datadir)/doc/gnunet/
-
-AM_MAKEINFOHTMLFLAGS = $(TEXINFO_HTMLFLAGS)
-
-info_TEXINFOS = 						\
-	gnunet.texi
-
-gnunet_TEXINFOS = 						\
-	chapters/developer.texi 				\
-	chapters/keyconcepts.texi 				\
-	chapters/preface.texi 				\
-	chapters/philosophy.texi 				\
-	chapters/installation.texi				\
-	chapters/user.texi 					\
-	chapters/vocabulary.texi				\
-	chapters/configuration.texi				\
-	chapters/contributing.texi				\
-	fdl-1.3.texi 						\
-	gpl-3.0.texi						\
-	agpl-3.0.texi						\
-	version.texi
-
-#if ACTIVATE_TEXINFO4
-# NOTE: 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.
-#AM_MAKEINFOHTMLFLAGS = --no-split --css-include=style.css --css-include=manual.css
-#else
-# 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.
-# This however is compatible to version 5.2. Thanks, I hate it.
-# AM_MAKEINFOHTMLFLAGS = --split=sections --css-ref="../style.css" --css-ref="../manual.css"
-#AM_MAKEINFOHTMLFLAGS = --split --css-ref="../style.css" --css-ref="../manual.css"
-#endif
-EXTRA_DIST =							\
-	$(gnunet_TEXINFOS)					\
-	htmlxref.cnf						\
-	version.texi                        \
-	run-gendocs.sh						\
-	docstyle.css                        \
-    manual.css                          \
-    reset.css                           \
-    style.css                           \
-    images/daemon_lego_block.svg  		\
-	images/lego_stack.svg			    \
-	images/service_lego_block.svg		\
-	images/gns.dot	                    \
-	images/structure.dot                \
-	images/tng.dot \
-    images/ascension_interaction.png \
-    images/ascension_ssd.png \
-    images/messenger_room.png \
-	images/gnunet-gtk-0-10-gns-a-done.png 			\
-	images/gnunet-gtk-0-10-gns-a.png 			\
-	images/daemon_lego_block.png 				\
-	images/gnunet-gtk-0-10-gns.png 				\
-	images/gnunet-0-10-peerinfo.png 			\
-	images/gnunet-gtk-0-10-identity.png 			\
-	images/gnunet-fs-gtk-0-10-star-tab.png 			\
-	images/gnunet-gtk-0-10-download-area.png 		\
-	images/gnunet-gtk-0-10-search-selected.png 		\
-	images/gnunet-gtk-0-10-fs-menu.png 			\
-	images/gnunet-gtk-0-10-traffic.png 			\
-	images/gnunet-gtk-0-10-fs.png 				\
-	images/gnunet-namestore-gtk-phone.png 			\
-	images/gnunet-gtk-0-10-fs-publish-editing.png 		\
-	images/gnunet-namestore-gtk-vpn.png 			\
-	images/gnunet-gtk-0-10-fs-published.png 		\
-	images/gnunet-setup-exit.png 				\
-	images/gnunet-gtk-0-10-fs-publish.png 			\
-	images/iceweasel-preferences.png 			\
-	images/gnunet-gtk-0-10-fs-publish-select.png 		\
-	images/iceweasel-proxy.png 				\
-	images/gnunet-gtk-0-10-fs-publish-with-file_0.png 	\
-	images/service_lego_block.png 				\
-	images/gnunet-gtk-0-10-fs-publish-with-file.png 	\
-	images/service_stack.png 				\
-	images/gnunet-gtk-0-10-fs-search.png 			\
-	images/gnunet-tutorial-service.png 			\
-	images/gnunet-tutorial-system.png			\
-	images/gns.jpg \
-	images/tng.png
-
-
-
-DISTCLEANFILES = 						\
-	gnunet.cps						    \
-	chapters/developer.cps				\
-	chapters/installation.cps			\
-	chapter/philosophy.cps				\
-	chapters/user.cps					\
-	chapters/configuration.cps			\
-	chapters/terminology.cps			\
-	chapters/vocabulary.cps				\
-	fdl-1.3.cps						    \
-	agpl-3.0.cps						\
-	gpl-3.0.cps
-
-CLEANFILES= \
-    stamp-vti \
-    version.texi \
-    $(DISTCLEANFILES)
-
-clean-local: clean-local-check
-.PHONY: clean-local-check
-clean-local-check:
-	rm -fr manual
-	rm -fr gnunet.html
-	rm -fr gnunet.t2p
-	rm -fr gnunet-c-tutorial.t2p
-
-# if HAVE_EXTENDED_DOCUMENTATION_BUILDING
-daemon_lego_block.png: images/daemon_lego_block.svg
-	convert images/daemon_lego_block.svg images/daemon_lego_block.png &&
-	pngcrush images/daemon_lego_block.png images/daemon_lego_block.png
-
-service_lego_block.png: images/service_lego_block.svg
-	convert images/service_lego_block.svg images/service_lego_block.png &&
-	pngcrush images/service_lego_block.png images/serivce_lego_block.png
-
-lego_stack.png: images/lego_stack.svg
-	convert images/lego_stack.svg images/lego_stack.png &&
-	pngcrush images/lego_stack.png images/lego_stack.png
-
-# doc-all-install:
-# 	@mkdir -p $(DESTDIR)/$(docdir)
-# 	@mkdir -p $(DESTDIR)/$(infoimagedir)
-# 	@mkdir -p $(DESTDIR)/$(infodir)
-# 	@install -m 0755 gnunet.pdf $(DESTDIR)/$(docdir)
-# 	@install -m 0755 gnunet.info $(DESTDIR)/$(infodir)
-# 	@install gnunet.html $(DESTDIR)/$(docdir)
-
-# doc-gendoc-install:
-# 	@mkdir -p $(DESTDIR)/$(docdir)
-# 	@cp -r manual $(DESTDIR)/$(docdir)
diff --git a/doc/old/tutorial/Makefile.am b/doc/old/tutorial/Makefile.am
@@ -1,79 +0,0 @@
-# This Makefile.am is in the public domain
-docdir = $(datadir)/doc/gnunet/
-
-AM_MAKEINFOHTMLFLAGS = $(TEXINFO_HTMLFLAGS)
-
-
-gnunet_tutorial_examples =					\
-	examples/001.c							\
-	examples/002.c							\
-	examples/003.c							\
-	examples/004.c							\
-	examples/005.c							\
-	examples/006.c							\
-	examples/007.c							\
-	examples/008.c							\
-	examples/009.c							\
-	examples/010.c							\
-	examples/011.c							\
-	examples/012.c							\
-	examples/013.c							\
-	examples/013.1.c						\
-	examples/014.c							\
-	examples/015.c							\
-	examples/016.c							\
-	examples/017.c							\
-	examples/018.c							\
-	examples/019.c							\
-	examples/020.c							\
-	examples/021.c							\
-	examples/022.c							\
-	examples/023.c							\
-	examples/024.c							\
-	examples/025.Makefile.am				\
-	examples/026.c                          \
-	examples/testbed_test.c
-
-info_TEXINFOS = tutorial.texi
-
-tutorial_TEXINFOS = \
-	fdl-1.3.texi 						\
-	gpl-3.0.texi						\
-	agpl-3.0.texi						\
-	version.texi
-
-EXTRA_DIST = \
-	$(tutorial_TEXINFOS)	\
-	$(gnunet_tutorial_examples)	\
-	htmlxref.cnf \
-	run-gendocs.sh \
-	docstyle.css \
-    manual.css \
-    reset.css \
-    style.css
-
-
-DISTCLEANFILES = \
-    tutorial.cps \
-	fdl-1.3.cps \
-	agpl-3.0.cps \
-	gpl-3.0.cps
-
-
-CLEANFILES= \
-    stamp-vti \
-    version.texi \
-    tutorial.t2p \
-    $(DISTCLEANFILES)
-
-doc-all-install:
-	@mkdir -p $(DESTDIR)/$(docdir)
-	@mkdir -p $(DESTDIR)/$(infoimagedir)
-	@mkdir -p $(DESTDIR)/$(infodir)
-	@install -m 0755 gnunet-tutorial.pdf $(DESTDIR)/$(docdir)
-	@install -m 0755 gnunet-tutorial.info $(DESTDIR)/$(infodir)
-	@install gnunet-tutorial.html $(DESTDIR)/$(docdir)
-
-doc-gendoc-install:
-	@mkdir -p $(DESTDIR)/$(docdir)
-	@cp -r manual $(DESTDIR)/$(docdir)
diff --git a/m4/.gitignore b/m4/.gitignore
@@ -1,6 +0,0 @@
-libtool.m4
-ltoptions.m4
-ltsugar.m4
-ltversion.m4
-lt~obsolete.m4
-wchar_t.m4
diff --git a/m4/ChangeLog b/m4/ChangeLog
@@ -1,100 +0,0 @@
-2024-12-10  gettextize  <bug-gnu-gettext@gnu.org>
-
-	* gettext.m4: Upgrade to gettext-0.21.
-	* host-cpu-c-abi.m4: New file, from gettext-0.21.
-	* iconv.m4: Upgrade to gettext-0.21.
-	* intlmacosx.m4: Upgrade to gettext-0.21.
-	* lib-ld.m4: Upgrade to gettext-0.21.
-	* lib-link.m4: Upgrade to gettext-0.21.
-	* lib-prefix.m4: Upgrade to gettext-0.21.
-	* nls.m4: Upgrade to gettext-0.21.
-	* po.m4: Upgrade to gettext-0.21.
-	* progtest.m4: Upgrade to gettext-0.21.
-	* Makefile.am (EXTRA_DIST): Add the new files.
-
-2015-06-27  gettextize  <bug-gnu-gettext@gnu.org>
-
-	* gettext.m4: Upgrade to gettext-0.18.3.
-	* iconv.m4: Upgrade to gettext-0.18.3.
-	* lib-ld.m4: Upgrade to gettext-0.18.3.
-	* lib-link.m4: Upgrade to gettext-0.18.3.
-	* lib-prefix.m4: Upgrade to gettext-0.18.3.
-	* nls.m4: Upgrade to gettext-0.18.3.
-	* po.m4: Upgrade to gettext-0.18.3.
-	* progtest.m4: Upgrade to gettext-0.18.3.
-
-2015-05-18  gettextize  <bug-gnu-gettext@gnu.org>
-
-	* iconv.m4: Upgrade to gettext-0.19.3.
-	* lib-ld.m4: Upgrade to gettext-0.19.3.
-	* lib-link.m4: Upgrade to gettext-0.19.3.
-	* lib-prefix.m4: Upgrade to gettext-0.19.3.
-	* nls.m4: Upgrade to gettext-0.19.3.
-	* progtest.m4: Upgrade to gettext-0.19.3.
-
-2007-02-08  gettextize  <bug-gnu-gettext@gnu.org>
-
-	* gettext.m4: Upgrade to gettext-0.16.1.
-	* iconv.m4: Upgrade to gettext-0.16.1.
-	* lib-ld.m4: Upgrade to gettext-0.16.1.
-	* lib-link.m4: Upgrade to gettext-0.16.1.
-	* lib-prefix.m4: Upgrade to gettext-0.16.1.
-	* nls.m4: Upgrade to gettext-0.16.1.
-	* po.m4: Upgrade to gettext-0.16.1.
-	* progtest.m4: Upgrade to gettext-0.16.1.
-	* codeset.m4: Upgrade to gettext-0.16.1.
-	* glibc2.m4: New file, from gettext-0.16.1.
-	* glibc21.m4: Upgrade to gettext-0.16.1.
-	* intdiv0.m4: Upgrade to gettext-0.16.1.
-	* intl.m4: New file, from gettext-0.16.1.
-	* intldir.m4: New file, from gettext-0.16.1.
-	* intmax.m4: Upgrade to gettext-0.16.1.
-	* inttypes_h.m4: Upgrade to gettext-0.16.1.
-	* inttypes-pri.m4: Upgrade to gettext-0.16.1.
-	* lcmessage.m4: Upgrade to gettext-0.16.1.
-	* lock.m4: New file, from gettext-0.16.1.
-	* longdouble.m4: Upgrade to gettext-0.16.1.
-	* longlong.m4: Upgrade to gettext-0.16.1.
-	* printf-posix.m4: Upgrade to gettext-0.16.1.
-	* size_max.m4: Upgrade to gettext-0.16.1.
-	* stdint_h.m4: Upgrade to gettext-0.16.1.
-	* uintmax_t.m4: Upgrade to gettext-0.16.1.
-	* ulonglong.m4: Upgrade to gettext-0.16.1.
-	* visibility.m4: New file, from gettext-0.16.1.
-	* wchar_t.m4: Upgrade to gettext-0.16.1.
-	* wint_t.m4: Upgrade to gettext-0.16.1.
-	* xsize.m4: Upgrade to gettext-0.16.1.
-	* Makefile.am (EXTRA_DIST): Add the new files.
-
-2004-08-21  gettextize  <bug-gnu-gettext@gnu.org>
-
-	* codeset.m4: New file, from gettext-0.14.
-	* gettext.m4: New file, from gettext-0.14.
-	* glibc21.m4: New file, from gettext-0.14.
-	* iconv.m4: New file, from gettext-0.14.
-	* intdiv0.m4: New file, from gettext-0.14.
-	* intmax.m4: New file, from gettext-0.14.
-	* inttypes.m4: New file, from gettext-0.14.
-	* inttypes_h.m4: New file, from gettext-0.14.
-	* inttypes-pri.m4: New file, from gettext-0.14.
-	* isc-posix.m4: New file, from gettext-0.14.
-	* lcmessage.m4: New file, from gettext-0.14.
-	* lib-ld.m4: New file, from gettext-0.14.
-	* lib-link.m4: New file, from gettext-0.14.
-	* lib-prefix.m4: New file, from gettext-0.14.
-	* longdouble.m4: New file, from gettext-0.14.
-	* longlong.m4: New file, from gettext-0.14.
-	* nls.m4: New file, from gettext-0.14.
-	* po.m4: New file, from gettext-0.14.
-	* printf-posix.m4: New file, from gettext-0.14.
-	* progtest.m4: New file, from gettext-0.14.
-	* signed.m4: New file, from gettext-0.14.
-	* size_max.m4: New file, from gettext-0.14.
-	* stdint_h.m4: New file, from gettext-0.14.
-	* uintmax_t.m4: New file, from gettext-0.14.
-	* ulonglong.m4: New file, from gettext-0.14.
-	* wchar_t.m4: New file, from gettext-0.14.
-	* wint_t.m4: New file, from gettext-0.14.
-	* xsize.m4: New file, from gettext-0.14.
-	* Makefile.am: New file.
-
diff --git a/m4/Makefile.am b/m4/Makefile.am
@@ -1,41 +0,0 @@
-# This Makefile.am is in the public domain
-EXTRA_DIST = host-cpu-c-abi.m4 build-to-host.m4 host-cpu-c-abi.m4 glibc2.m4 intl.m4 intldir.m4 lock.m4 visibility.m4 \
-ax_compare_version.m4 \
-ax_lib_postgresql.m4 \
-absolute-header.m4 \
-libunistring.m4 \
-codeset.m4 \
-freetype2.m4\
-gettext.m4\
-glib-2.0.m4\
-glibc21.m4\
-glib-gettext.m4\
-gnulib-cache.m4\
-gtk-2.0.m4\
-iconv.m4\
-intdiv0.m4\
-intmax.m4\
-inttypes_h.m4\
-inttypes.m4\
-inttypes-pri.m4\
-isc-posix.m4\
-lcmessage.m4\
-libgcrypt.m4\
-libcurl.m4\
-lib-ld.m4\
-lib-link.m4\
-lib-prefix.m4\
-libxml2.m4\
-longdouble.m4\
-longlong.m4\
-nls.m4\
-pkg.m4\
-po.m4\
-printf-posix.m4\
-progtest.m4\
-signed.m4\
-size_max.m4\
-stdint_h.m4\
-uintmax_t.m4\
-ulonglong.m4\
-xsize.m4
diff --git a/m4/absolute-header.m4 b/m4/absolute-header.m4
@@ -1,77 +0,0 @@
-# absolute-header.m4 serial 12
-dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Derek Price.
-
-# gl_ABSOLUTE_HEADER(HEADER1 HEADER2 ...)
-# ---------------------------------------
-# Find the absolute name of a header file, testing first if the header exists.
-# If the header were sys/inttypes.h, this macro would define
-# ABSOLUTE_SYS_INTTYPES_H to the `""' quoted absolute name of sys/inttypes.h
-# in config.h
-# (e.g. `#define ABSOLUTE_SYS_INTTYPES_H "///usr/include/sys/inttypes.h"').
-# The three "///" are to pacify Sun C 5.8, which otherwise would say
-# "warning: #include of /usr/include/... may be non-portable".
-# Use `""', not `<>', so that the /// cannot be confused with a C99 comment.
-# Note: This macro assumes that the header file is not empty after
-# preprocessing, i.e. it does not only define preprocessor macros but also
-# provides some type/enum definitions or function/variable declarations.
-AC_DEFUN([gl_ABSOLUTE_HEADER],
-[AC_REQUIRE([AC_CANONICAL_HOST])
-AC_LANG_PREPROC_REQUIRE()dnl
-m4_foreach_w([gl_HEADER_NAME], [$1],
-  [AS_VAR_PUSHDEF([gl_absolute_header],
-                  [gl_cv_absolute_]m4_defn([gl_HEADER_NAME]))dnl
-  AC_CACHE_CHECK([absolute name of <]m4_defn([gl_HEADER_NAME])[>],
-    m4_defn([gl_absolute_header]),
-    [AS_VAR_PUSHDEF([ac_header_exists],
-                    [ac_cv_header_]m4_defn([gl_HEADER_NAME]))dnl
-    AC_CHECK_HEADERS_ONCE(m4_defn([gl_HEADER_NAME]))dnl
-    if test AS_VAR_GET(ac_header_exists) = yes; then
-      gl_ABSOLUTE_HEADER_ONE(m4_defn([gl_HEADER_NAME]))
-    fi
-    AS_VAR_POPDEF([ac_header_exists])dnl
-    ])dnl
-  AC_DEFINE_UNQUOTED(AS_TR_CPP([ABSOLUTE_]m4_defn([gl_HEADER_NAME])),
-                     ["AS_VAR_GET(gl_absolute_header)"],
-                     [Define this to an absolute name of <]m4_defn([gl_HEADER_NAME])[>.])
-  AS_VAR_POPDEF([gl_absolute_header])dnl
-])dnl
-])# gl_ABSOLUTE_HEADER
-
-# gl_ABSOLUTE_HEADER_ONE(HEADER)
-# ------------------------------
-# Like gl_ABSOLUTE_HEADER, except that:
-#   - it assumes that the header exists,
-#   - it uses the current CPPFLAGS,
-#   - it does not cache the result,
-#   - it is silent.
-AC_DEFUN([gl_ABSOLUTE_HEADER_ONE],
-[
-  AC_LANG_CONFTEST([AC_LANG_SOURCE([[#include <]]m4_dquote([$1])[[>]])])
-  dnl AIX "xlc -E" and "cc -E" omit #line directives for header files
-  dnl that contain only a #include of other header files and no
-  dnl non-comment tokens of their own. This leads to a failure to
-  dnl detect the absolute name of <dirent.h>, <signal.h>, <poll.h>
-  dnl and others. The workaround is to force preservation of comments
-  dnl through option -C. This ensures all necessary #line directives
-  dnl are present. GCC supports option -C as well.
-  case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-  dnl eval is necessary to expand gl_absname_cpp.
-  dnl Ultrix and Pyramid sh refuse to redirect output of eval,
-  dnl so use subshell.
-  AS_VAR_SET([gl_cv_absolute_]AS_TR_SH([[$1]]),
-[`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
-sed -n '\#/$1#{
-        s#.*"\(.*/$1\)".*#\1#
-        s#^/[^/]#//&#
-        p
-        q
-}'`])
-])
diff --git a/m4/ac_define_dir.m4 b/m4/ac_define_dir.m4
@@ -1,35 +0,0 @@
-dnl @synopsis AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
-dnl
-dnl This macro _AC_DEFINEs VARNAME to the expansion of the DIR
-dnl variable, taking care of fixing up ${prefix} and such.
-dnl
-dnl VARNAME is offered as both a C preprocessor symbol, and an output
-dnl variable.
-dnl
-dnl Note that the 3 argument form is only supported with autoconf 2.13
-dnl and later (i.e. only where _AC_DEFINE supports 3 arguments).
-dnl
-dnl Examples:
-dnl
-dnl    AC_DEFINE_DIR(DATADIR, datadir)
-dnl    AC_DEFINE_DIR(PROG_PATH, bindir, [Location of installed binaries])
-dnl
-dnl @category Misc
-dnl @author Stepan Kasal <kasal@ucw.cz>
-dnl @author Andreas Schwab <schwab@suse.de>
-dnl @author Guido Draheim <guidod@gmx.de>
-dnl @author Alexandre Oliva
-dnl @version 2005-01-17
-dnl @license AllPermissive
-
-AC_DEFUN([AC_DEFINE_DIR], [
-  prefix_NONE=
-  exec_prefix_NONE=
-  test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
-  test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
-  eval ac_define_dir="\"[$]$2\""
-  AC_SUBST($1, "$ac_define_dir")
-  AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3])
-  test "$prefix_NONE" && prefix=NONE
-  test "$exec_prefix_NONE" && exec_prefix=NONE
-])
diff --git a/m4/align.m4 b/m4/align.m4
@@ -1,35 +0,0 @@
-# align.m4
-dnl Copyright (C) 2008 Christian Grothoff
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-# Define HAVE_UNALIGNED_64_ACCESS if reading a 64-bit value at a 32-bit aligned offset works
-# Note that the program intentionally causes a SIGBUS (so you may
-# see some message along those lines on the console).
-AC_DEFUN([AC_UNALIGNED_64_ACCESS],
-[AC_CACHE_CHECK([whether unaligned 64-bit access works],
- ac_cv_unaligned_64_access,
- [
- AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-                                #include <stdlib.h>
-                                struct S { int a,b,c;};
-                                ]],
-                               [[struct S s = {0,0,0}; long long * p = (long long *) &s.b;
-			         void *bp = malloc (50);
- 				 long long x = *p;
-				 long long *be = (long long*) &bp[1];
-				 long long y = *be;
-				 return (int) x*y;]])],
- ac_cv_unaligned_64_access=yes,
- ac_cv_unaligned_64_access=no,
- ac_cv_unaligned_64_access=no)
- ])
- case "$ac_cv_unaligned_64_access" in
-  *yes) value=1;;
-  *) value=0;;
- esac
- AC_DEFINE_UNQUOTED([HAVE_UNALIGNED_64_ACCESS], $value, [We can access-64 bit values that are only 32-bit aligned])
-])
diff --git a/m4/as-auto-alt.m4 b/m4/as-auto-alt.m4
@@ -1,50 +0,0 @@
-dnl as-auto-alt.m4 0.0.2
-dnl autostars m4 macro for supplying alternate autotools versions to configure
-dnl thomas@apestaart.org
-dnl
-dnl AS_AUTOTOOLS_ALTERNATE()
-dnl
-dnl supplies --with arguments for autoconf, autoheader, automake, aclocal
-
-AC_DEFUN([AS_AUTOTOOLS_ALTERNATE],
-[
-  dnl allow for different autoconf version
-  AC_ARG_WITH(autoconf,
-    AS_HELP_STRING([--with-autoconf],
-                   [use a different autoconf for regeneration of Makefiles]),
-    [
-      unset AUTOCONF
-      AM_MISSING_PROG(AUTOCONF, ${withval})
-      AC_MSG_NOTICE([Using $AUTOCONF as autoconf])
-    ])
-
-  dnl allow for different autoheader version
-  AC_ARG_WITH(autoheader,
-    AS_HELP_STRING([--with-autoheader],
-                   [use a different autoheader for regeneration of Makefiles]),
-    [
-      unset AUTOHEADER
-      AM_MISSING_PROG(AUTOHEADER, ${withval})
-      AC_MSG_NOTICE([Using $AUTOHEADER as autoheader])
-    ])
-
-  dnl allow for different automake version
-  AC_ARG_WITH(automake,
-    AS_HELP_STRING([--with-automake],
-                   [use a different automake for regeneration of Makefiles]),
-    [
-      unset AUTOMAKE
-      AM_MISSING_PROG(AUTOMAKE, ${withval})
-      AC_MSG_NOTICE([Using $AUTOMAKE as automake])
-    ])
-
-  dnl allow for different aclocal version
-  AC_ARG_WITH(aclocal,
-    AS_HELP_STRING([--with-aclocal],
-                   [use a different aclocal for regeneration of Makefiles]),
-    [
-      unset ACLOCAL
-      AM_MISSING_PROG(ACLOCAL, ${withval})
-      AC_MSG_NOTICE([Using $ACLOCAL as aclocal])
-    ])
-])
diff --git a/m4/ax_compare_version.m4 b/m4/ax_compare_version.m4
@@ -1,177 +0,0 @@
-# ===========================================================================
-#    https://www.gnu.org/software/autoconf-archive/ax_compare_version.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
-#
-# DESCRIPTION
-#
-#   This macro compares two version strings. Due to the various number of
-#   minor-version numbers that can exist, and the fact that string
-#   comparisons are not compatible with numeric comparisons, this is not
-#   necessarily trivial to do in a autoconf script. This macro makes doing
-#   these comparisons easy.
-#
-#   The six basic comparisons are available, as well as checking equality
-#   limited to a certain number of minor-version levels.
-#
-#   The operator OP determines what type of comparison to do, and can be one
-#   of:
-#
-#    eq  - equal (test A == B)
-#    ne  - not equal (test A != B)
-#    le  - less than or equal (test A <= B)
-#    ge  - greater than or equal (test A >= B)
-#    lt  - less than (test A < B)
-#    gt  - greater than (test A > B)
-#
-#   Additionally, the eq and ne operator can have a number after it to limit
-#   the test to that number of minor versions.
-#
-#    eq0 - equal up to the length of the shorter version
-#    ne0 - not equal up to the length of the shorter version
-#    eqN - equal up to N sub-version levels
-#    neN - not equal up to N sub-version levels
-#
-#   When the condition is true, shell commands ACTION-IF-TRUE are run,
-#   otherwise shell commands ACTION-IF-FALSE are run. The environment
-#   variable 'ax_compare_version' is always set to either 'true' or 'false'
-#   as well.
-#
-#   Examples:
-#
-#     AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8])
-#     AX_COMPARE_VERSION([3.15],[lt],[3.15.8])
-#
-#   would both be true.
-#
-#     AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8])
-#     AX_COMPARE_VERSION([3.15],[gt],[3.15.8])
-#
-#   would both be false.
-#
-#     AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8])
-#
-#   would be true because it is only comparing two minor versions.
-#
-#     AX_COMPARE_VERSION([3.15.7],[eq0],[3.15])
-#
-#   would be true because it is only comparing the lesser number of minor
-#   versions of the two values.
-#
-#   Note: The characters that separate the version numbers do not matter. An
-#   empty string is the same as version 0. OP is evaluated by autoconf, not
-#   configure, so must be a string, not a variable.
-#
-#   The author would like to acknowledge Guido Draheim whose advice about
-#   the m4_case and m4_ifvaln functions make this macro only include the
-#   portions necessary to perform the specific comparison specified by the
-#   OP argument in the final configure script.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Tim Toolan <toolan@ele.uri.edu>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 13
-
-dnl #########################################################################
-AC_DEFUN([AX_COMPARE_VERSION], [
-  AC_REQUIRE([AC_PROG_AWK])
-
-  # Used to indicate true or false condition
-  ax_compare_version=false
-
-  # Convert the two version strings to be compared into a format that
-  # allows a simple string comparison.  The end result is that a version
-  # string of the form 1.12.5-r617 will be converted to the form
-  # 0001001200050617.  In other words, each number is zero padded to four
-  # digits, and non digits are removed.
-  AS_VAR_PUSHDEF([A],[ax_compare_version_A])
-  A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
-                     -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/[[^0-9]]//g'`
-
-  AS_VAR_PUSHDEF([B],[ax_compare_version_B])
-  B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
-                     -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/[[^0-9]]//g'`
-
-  dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary
-  dnl # then the first line is used to determine if the condition is true.
-  dnl # The sed right after the echo is to remove any indented white space.
-  m4_case(m4_tolower($2),
-  [lt],[
-    ax_compare_version=`echo "x$A
-x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"`
-  ],
-  [gt],[
-    ax_compare_version=`echo "x$A
-x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"`
-  ],
-  [le],[
-    ax_compare_version=`echo "x$A
-x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"`
-  ],
-  [ge],[
-    ax_compare_version=`echo "x$A
-x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"`
-  ],[
-    dnl Split the operator from the subversion count if present.
-    m4_bmatch(m4_substr($2,2),
-    [0],[
-      # A count of zero means use the length of the shorter version.
-      # Determine the number of characters in A and B.
-      ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'`
-      ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'`
-
-      # Set A to no more than B's length and B to no more than A's length.
-      A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"`
-      B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"`
-    ],
-    [[0-9]+],[
-      # A count greater than zero means use only that many subversions
-      A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
-      B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
-    ],
-    [.+],[
-      AC_WARNING(
-        [invalid OP numeric parameter: $2])
-    ],[])
-
-    # Pad zeros at end of numbers to make same length.
-    ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`"
-    B="$B`echo $A | sed 's/./0/g'`"
-    A="$ax_compare_version_tmp_A"
-
-    # Check for equality or inequality as necessary.
-    m4_case(m4_tolower(m4_substr($2,0,2)),
-    [eq],[
-      test "x$A" = "x$B" && ax_compare_version=true
-    ],
-    [ne],[
-      test "x$A" != "x$B" && ax_compare_version=true
-    ],[
-      AC_WARNING([invalid OP parameter: $2])
-    ])
-  ])
-
-  AS_VAR_POPDEF([A])dnl
-  AS_VAR_POPDEF([B])dnl
-
-  dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE.
-  if test "$ax_compare_version" = "true" ; then
-    m4_ifvaln([$4],[$4],[:])dnl
-    m4_ifvaln([$5],[else $5])dnl
-  fi
-]) dnl AX_COMPARE_VERSION
diff --git a/m4/ax_lib_postgresql.m4 b/m4/ax_lib_postgresql.m4
@@ -1,247 +0,0 @@
-# ===========================================================================
-#    https://www.gnu.org/software/autoconf-archive/ax_lib_postgresql.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_LIB_POSTGRESQL([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
-#
-# DESCRIPTION
-#
-#   This macro provides tests of availability of PostgreSQL 'libpq' library
-#   of particular version or newer.
-#
-#   AX_LIB_POSTGRESQL macro takes only one argument which is optional. If
-#   there is no required version passed, then macro does not run version
-#   test.
-#
-#   The --with-postgresql option takes one of three possible values:
-#
-#   no - do not check for PostgreSQL client library
-#
-#   yes - do check for PostgreSQL library in standard locations (pg_config
-#   should be in the PATH)
-#
-#   path - complete path to pg_config utility, use this option if pg_config
-#   can't be found in the PATH (You could set also PG_CONFIG variable)
-#
-#   This macro calls:
-#
-#     AC_SUBST(POSTGRESQL_CPPFLAGS)
-#     AC_SUBST(POSTGRESQL_LDFLAGS)
-#     AC_SUBST(POSTGRESQL_LIBS)
-#     AC_SUBST(POSTGRESQL_VERSION)
-#
-#   And sets:
-#
-#     HAVE_POSTGRESQL
-#
-#   It execute if found ACTION-IF-FOUND (empty by default) and
-#   ACTION-IF-NOT-FOUND (AC_MSG_FAILURE by default) if not found.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Mateusz Loskot <mateusz@loskot.net>
-#   Copyright (c) 2014 Sree Harsha Totakura <sreeharsha@totakura.in>
-#   Copyright (c) 2018 Bastien Roucaries <rouca@debian.org>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 22
-
-AC_DEFUN([_AX_LIB_POSTGRESQL_OLD],[
-	found_postgresql="no"
-	_AX_LIB_POSTGRESQL_OLD_fail="no"
-	while true; do
-	  AC_CACHE_CHECK([for the pg_config program], [ac_cv_path_PG_CONFIG],
-	    [AC_PATH_PROGS_FEATURE_CHECK([PG_CONFIG], [pg_config],
-	      [[ac_cv_path_PG_CONFIG="";$ac_path_PG_CONFIG --includedir > /dev/null \
-		&& ac_cv_path_PG_CONFIG=$ac_path_PG_CONFIG ac_path_PG_CONFIG_found=:]],
-	      [ac_cv_path_PG_CONFIG=""])])
-	  PG_CONFIG=$ac_cv_path_PG_CONFIG
-	  AS_IF([test "X$PG_CONFIG" = "X"],[break])
-
-	  AC_CACHE_CHECK([for the PostgreSQL libraries CPPFLAGS],[ac_cv_POSTGRESQL_CPPFLAGS],
-		       [ac_cv_POSTGRESQL_CPPFLAGS="-I`$PG_CONFIG --includedir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes])
-	  AS_IF([test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"],[break])
-	  POSTGRESQL_CPPFLAGS="$ac_cv_POSTGRESQL_CPPFLAGS"
-
-	  AC_CACHE_CHECK([for the PostgreSQL libraries LDFLAGS],[ac_cv_POSTGRESQL_LDFLAGS],
-		       [ac_cv_POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes])
-	  AS_IF([test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"],[break])
-	  POSTGRESQL_LDFLAGS="$ac_cv_POSTGRESQL_LDFLAGS"
-
-	  AC_CACHE_CHECK([for the PostgreSQL libraries LIBS],[ac_cv_POSTGRESQL_LIBS],
-		       [ac_cv_POSTGRESQL_LIBS="-lpq"])
-	  POSTGRESQL_LIBS="$ac_cv_POSTGRESQL_LIBS"
-
-	  AC_CACHE_CHECK([for the PostgreSQL version],[ac_cv_POSTGRESQL_VERSION],
-		       [
-			ac_cv_POSTGRESQL_VERSION=`$PG_CONFIG --version | sed "s/^PostgreSQL[[[:space:]]][[[:space:]]]*\([[0-9.]][[0-9.]]*\).*/\1/"` \
-			      || _AX_LIB_POSTGRESQL_OLD_fail=yes
-		       ])
-	  AS_IF([test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"],[break])
-	  POSTGRESQL_VERSION="$ac_cv_POSTGRESQL_VERSION"
-
-
-	  dnl
-	  dnl Check if required version of PostgreSQL is available
-	  dnl
-	  AS_IF([test X"$postgresql_version_req" != "X"],[
-	     AC_MSG_CHECKING([if PostgreSQL version $POSTGRESQL_VERSION is >= $postgresql_version_req])
-	     AX_COMPARE_VERSION([$POSTGRESQL_VERSION],[ge],[$postgresql_version_req],
-				[found_postgresql_req_version=yes],[found_postgresql_req_version=no])
-	     AC_MSG_RESULT([$found_postgresql_req_version])
-	  ])
-	  AS_IF([test "Xfound_postgresql_req_version" = "Xno"],[break])
-
-	  found_postgresql="yes"
-	  break
-	done
-])
-
-AC_DEFUN([_AX_LIB_POSTGRESQL_PKG_CONFIG],
-[
-  AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-  found_postgresql=no
-
-  while true; do
-    PKG_PROG_PKG_CONFIG
-    AS_IF([test X$PKG_CONFIG = X],[break])
-
-    _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=no;
-    AS_IF([test "X$postgresql_version_req" = "X"],
-	  [PKG_CHECK_EXISTS([libpq],[found_postgresql_pkg_config=yes],[found_postgresql=no])],
-	  [PKG_CHECK_EXISTS([libpq >= "$postgresql_version_req"],
-			   [found_postgresql=yes],[found_postgresql=no])])
-    AS_IF([test "X$found_postgresql" = "no"],[break])
-
-    AC_CACHE_CHECK([for the PostgreSQL libraries CPPFLAGS],[ac_cv_POSTGRESQL_CPPFLAGS],
-		   [ac_cv_POSTGRESQL_CPPFLAGS="`$PKG_CONFIG libpq --cflags-only-I`" || _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=yes])
-    AS_IF([test "X$_AX_LIB_POSTGRESQL_PKG_CONFIG_fail" = "Xyes"],[break])
-    POSTGRESQL_CPPFLAGS="$ac_cv_POSTGRESQL_CPPFLAGS"
-
-
-    AC_CACHE_CHECK([for the PostgreSQL libraries LDFLAGS],[ac_cv_POSTGRESQL_LDFLAGS],
-		   [ac_cv_POSTGRESQL_LDFLAGS="`$PKG_CONFIG libpq --libs-only-L --libs-only-other`" || _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=yes])
-    AS_IF([test "X$_AX_LIB_POSTGRESQL_PKG_CONFIG_fail" = "Xyes"],[break])
-    POSTGRESQL_LDFLAGS="$ac_cv_POSTGRESQL_LDFLAGS"
-
-
-    AC_CACHE_CHECK([for the PostgreSQL libraries LIBS],[ac_cv_POSTGRESQL_LIBS],
-		   [ac_cv_POSTGRESQL_LIBS="`$PKG_CONFIG libpq --libs-only-l`" || _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=ye])
-    AS_IF([test "X$_AX_LIB_POSTGRESQL_PKG_CONFIG_fail" = "Xyes"],[break])
-    POSTGRESQL_LIBS="$ac_cv_POSTGRESQL_LIBS"
-
-    dnl already checked by exist but need to be recovered
-    AC_CACHE_CHECK([for the PostgreSQL version],[ac_cv_POSTGRESQL_VERSION],
-		   [ac_cv_POSTGRESQL_VERSION="`$PKG_CONFIG libpq --modversion`" || _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=yes])
-    AS_IF([test "X$_AX_LIB_POSTGRESQL_PKG_CONFIG_fail" = "Xyes"],[break])
-    POSTGRESQL_VERSION="$ac_cv_POSTGRESQL_VERSION"
-
-    found_postgresql=yes
-    break;
-  done
-
-])
-
-
-
-AC_DEFUN([AX_LIB_POSTGRESQL],
-[
-    AC_ARG_WITH([postgresql],
-	AS_HELP_STRING([--with-postgresql=@<:@ARG@:>@],
-	    [use PostgreSQL library @<:@default=yes@:>@, optionally specify path to pg_config]
-	),
-	[
-	AS_CASE([$withval],
-		[[[nN]][[oO]]],[want_postgresql="no"],
-		[[[yY]][[eE]][[sS]]],[want_postgresql="yes"],
-		[
-			want_postgresql="yes"
-			PG_CONFIG="$withval"
-		])
-	],
-	[want_postgresql="yes"]
-    )
-
-    AC_ARG_VAR([POSTGRESQL_CPPFLAGS],[cpp flags for PostgreSQL overriding detected flags])
-    AC_ARG_VAR([POSTGRESQL_LIBFLAGS],[libs for PostgreSQL overriding detected flags])
-    AC_ARG_VAR([POSTGRESQL_LDFLAGS],[linker flags for PostgreSQL overriding detected flags])
-
-    # populate cache
-    AS_IF([test "X$POSTGRESQL_CPPFLAGS" != X],[ac_cv_POSTGRESQL_CPPFLAGS="$POSTGRESQL_CPPFLAGS"])
-    AS_IF([test "X$POSTGRESQL_LDFLAGS" != X],[ac_cv_POSTGRESQL_LDFLAGS="$POSTGRESQL_LDFLAGS"])
-    AS_IF([test "X$POSTGRESQL_LIBS" != X],[ac_cv_POSTGRESQL_LIBS="$POSTGRESQL_LIBS"])
-
-    postgresql_version_req=ifelse([$1], [], [], [$1])
-    found_postgresql="no"
-
-    POSTGRESQL_VERSION=""
-
-    dnl
-    dnl Check PostgreSQL libraries (libpq)
-    dnl
-    AS_IF([test X"$want_postgresql" = "Xyes"],[
-      _AX_LIB_POSTGRESQL_PKG_CONFIG
-
-
-      AS_IF([test X"$found_postgresql" = "Xno"],
-	    [_AX_LIB_POSTGRESQL_OLD])
-
-      AS_IF([test X"$found_postgresql" = Xyes],[
-	  _AX_LIB_POSTGRESQL_OLD_CPPFLAGS="$CPPFLAGS"
-	  CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS"
-	  _AX_LIB_POSTGRESQL_OLD_LDFLAGS="$LDFLAGS"
-	  LDFLAGS="$LDFLAGS $POSTGRESQL_LDFLAGS"
-	  _AX_LIB_POSTGRESQL_OLD_LIBS="$LIBS"
-	  LIBS="$LIBS $POSTGRESQL_LIBS"
-	  while true; do
-	    dnl try to compile
-	    AC_CHECK_HEADER([libpq-fe.h],[],[found_postgresql=no])
-	    AS_IF([test "X$found_postgresql" = "Xno"],[break])
-	    dnl try now to link
-	    AC_CACHE_CHECK([for the PostgreSQL library linking is working],[ac_cv_postgresql_found],
-	    [
-	      AC_LINK_IFELSE([
-		AC_LANG_PROGRAM(
-		  [
-		   #include <libpq-fe.h>
-		  ],
-		  [[
-		    char conninfo[]="dbname = postgres";
-		    PGconn     *conn;
-		    conn = PQconnectdb(conninfo);
-		  ]]
-		 )
-		],[ac_cv_postgresql_found=yes],
-		  [ac_cv_postgresql_found=no])
-	     ])
-	    found_postgresql="$ac_cv_postgresql_found"
-	    AS_IF([test "X$found_postgresql" = "Xno"],[break])
-	    break
-	done
-	CPPFLAGS="$_AX_LIB_POSTGRESQL_OLD_CPPFLAGS"
-	LDFLAGS="$_AX_LIB_POSTGRESQL_OLD_LDFLAGS"
-	LIBS="$_AX_LIB_POSTGRESQL_OLD_LIBS"
-	])
-
-
-      AS_IF([test "x$found_postgresql" = "xyes"],[
-		AC_DEFINE([HAVE_POSTGRESQL], [1],
-			  [Define to 1 if PostgreSQL libraries are available])])
-    ])
-
-    AC_SUBST([POSTGRESQL_VERSION])
-    AC_SUBST([POSTGRESQL_CPPFLAGS])
-    AC_SUBST([POSTGRESQL_LDFLAGS])
-    AC_SUBST([POSTGRESQL_LIBS])
-
-    AS_IF([test "x$found_postgresql" = "xyes"],
-     [ifelse([$2], , :, [$2])],
-     [ifelse([$3], , AS_IF([test X"$want_postgresql" = "Xyes"],[AC_MSG_ERROR([Library requirements (PostgreSQL) not met.])],[:]), [$3])])
-
-])
diff --git a/m4/build-to-host.m4 b/m4/build-to-host.m4
@@ -1,79 +0,0 @@
-# build-to-host.m4 serial 3
-dnl Copyright (C) 2023-2024 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl Written by Bruno Haible.
-
-dnl When the build environment ($build_os) is different from the target runtime
-dnl environment ($host_os), file names may need to be converted from the build
-dnl environment syntax to the target runtime environment syntax. This is
-dnl because the Makefiles are executed (mostly) by build environment tools and
-dnl therefore expect file names in build environment syntax, whereas the runtime
-dnl expects file names in target runtime environment syntax.
-dnl
-dnl For example, if $build_os = cygwin and $host_os = mingw32, filenames need
-dnl be converted from Cygwin syntax to native Windows syntax:
-dnl   /cygdrive/c/foo/bar -> C:\foo\bar
-dnl   /usr/local/share    -> C:\cygwin64\usr\local\share
-dnl
-dnl gl_BUILD_TO_HOST([somedir])
-dnl This macro takes as input an AC_SUBSTed variable 'somedir', which must
-dnl already have its final value assigned, and produces two additional
-dnl AC_SUBSTed variables 'somedir_c' and 'somedir_c_make', that designate the
-dnl same file name value, just in different syntax:
-dnl   - somedir_c       is the file name in target runtime environment syntax,
-dnl                     as a C string (starting and ending with a double-quote,
-dnl                     and with escaped backslashes and double-quotes in
-dnl                     between).
-dnl   - somedir_c_make  is the same thing, escaped for use in a Makefile.
-
-AC_DEFUN([gl_BUILD_TO_HOST],
-[
-  AC_REQUIRE([AC_CANONICAL_BUILD])
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([gl_BUILD_TO_HOST_INIT])
-
-  dnl Define somedir_c.
-  gl_final_[$1]="$[$1]"
-  dnl Translate it from build syntax to host syntax.
-  case "$build_os" in
-    cygwin*)
-      case "$host_os" in
-        mingw* | windows*)
-          gl_final_[$1]=`cygpath -w "$gl_final_[$1]"` ;;
-      esac
-      ;;
-  esac
-  dnl Convert it to C string syntax.
-  [$1]_c=`printf '%s\n' "$gl_final_[$1]" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes" | tr -d "$gl_tr_cr"`
-  [$1]_c='"'"$[$1]_c"'"'
-  AC_SUBST([$1_c])
-
-  dnl Define somedir_c_make.
-  [$1]_c_make=`printf '%s\n' "$[$1]_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2" | tr -d "$gl_tr_cr"`
-  dnl Use the substituted somedir variable, when possible, so that the user
-  dnl may adjust somedir a posteriori when there are no special characters.
-  if test "$[$1]_c_make" = '\"'"${gl_final_[$1]}"'\"'; then
-    [$1]_c_make='\"$([$1])\"'
-  fi
-  AC_SUBST([$1_c_make])
-])
-
-dnl Some initializations for gl_BUILD_TO_HOST.
-AC_DEFUN([gl_BUILD_TO_HOST_INIT],
-[
-  gl_sed_double_backslashes='s/\\/\\\\/g'
-  gl_sed_escape_doublequotes='s/"/\\"/g'
-changequote(,)dnl
-  gl_sed_escape_for_make_1="s,\\([ \"&'();<>\\\\\`|]\\),\\\\\\1,g"
-changequote([,])dnl
-  gl_sed_escape_for_make_2='s,\$,\\$$,g'
-  dnl Find out how to remove carriage returns from output. Solaris /usr/ucb/tr
-  dnl does not understand '\r'.
-  case `echo r | tr -d '\r'` in
-    '') gl_tr_cr='\015' ;;
-    *)  gl_tr_cr='\r' ;;
-  esac
-])
diff --git a/m4/check-latex-package.m4 b/m4/check-latex-package.m4
@@ -1,42 +0,0 @@
-dnl
-dnl CHECK_LATEX_PACKAGE(FEATURE-NAME,
-dnl                     PACKAGE-NAME,
-dnl                     ACTION-IF-FOUND,
-dnl                     ACTION-IF-NOT-FOUND)
-dnl
-dnl Tries to compile a small LaTeX document to see if the requested package is
-dnl available to be used with \usepackage.
-dnl
-dnl The result will be cached in the ac_cv_tex_PACKAGE-NAME variable.
-dnl
-dnl This macro also checks for pdflatex as in AC_CHECK_PROGS and the result
-dnl is made available in the PDFLATEX_BINARY variable (all capitals like that.)
-dnl
-dnl FEATURE-NAME is one or more words to identify the check;
-dnl PACKAGE-NAME is the package as it appears in the \usepackage statement
-dnl ACTION-IF-FOUND (optional) commands to execute if the package is installed
-dnl ACTION-IF-NOT-FOUND (optional) the inverse of ACTION-IF-FOUND
-dnl
-AC_DEFUN([CHECK_LATEX_PACKAGE],
-[AC_CHECK_PROGS([PDFLATEX_BINARY], [pdflatex], [no])
-
- AS_IF([test "x$ac_cv_prog_PDFLATEX_BINARY" = "xno"],
-   [m4_if([$4], ,:,[$4])],
-   [AC_CACHE_CHECK([for the $1 package for LaTeX], [AS_TR_SH([ac_cv_tex_][$2])],
-      [cat <<EOF > conftest.tex
-\\documentclass{article}
-\\usepackage{$2}
-\\begin{document}
-Hello
-\\end{document}
-EOF
-
-       "$ac_cv_prog_PDFLATEX_BINARY" conftest.tex 1>/dev/null 2>&1
-       AS_IF([test "x$?" = "x0"],
-         [AS_VAR_SET([AS_TR_SH([ac_cv_tex_][$2])], [yes])],
-	 [AS_VAR_SET([AS_TR_SH([ac_cv_tex_][$2])], [no])])])
-
-    AS_VAR_IF([AS_TR_SH([ac_cv_tex_][$2])], [xyes],
-      [m4_if([$3], ,:,[$3])],
-      [m4_if([$4], ,:,[$4])])])
-])dnl
diff --git a/m4/check-libheader.m4 b/m4/check-libheader.m4
@@ -1,29 +0,0 @@
-dnl
-dnl CHECK-LIBHEADER(FEATURE-NAME, LIB-NAME, LIB-FUNCTION, HEADER-NAME,
-dnl                 ACTION-IF-FOUND, ACTION-IF-NOT-FOUND,
-dnl                 EXTRA-LDFLAGS, EXTRA-CPPFLAGS)
-dnl
-dnl FEATURE-NAME        - feature name; library and header files are treated
-dnl                       as feature, which we look for
-dnl LIB-NAME            - library name as in AC_CHECK_LIB macro
-dnl LIB-FUNCTION        - library symbol as in AC_CHECK_LIB macro
-dnl HEADER-NAME         - header file name as in AC_CHECK_HEADER
-dnl ACTION-IF-FOUND     - when feature is found then execute given action
-dnl ACTION-IF-NOT-FOUND - when feature is not found then execute given action
-dnl EXTRA-LDFLAGS       - extra linker flags (-L or -l)
-dnl EXTRA-CPPFLAGS      - extra C preprocessor flags, e.g. -I/usr/X11R6/include
-dnl
-dnl
-AC_DEFUN([CHECK_LIBHEADER],
-[m4_if([$7], ,:,[LDFLAGS="$7 $LDFLAGS"])
- m4_if([$8], ,:,[CPPFLAGS="$8 $CPPFLAGS"])
-
- AC_CHECK_HEADERS([$4],
-   [AC_CHECK_LIB([$2], [$3],
-      [eval "HAVE_]AS_TR_SH([$1])[=yes"]
-       m4_if([$5], ,:,[$5]),
-      [eval "HAVE_]AS_TR_SH([$1])[=no"]
-       m4_if([$6], ,:,[$6]))],
-   [eval "HAVE_]AS_TR_SH([$1])[=no"]
-    m4_if([$6], ,:,[$6]))
-])dnl
diff --git a/m4/codeset.m4 b/m4/codeset.m4
@@ -1,23 +0,0 @@
-# codeset.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2006, 2008-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_LANGINFO_CODESET],
-[
-  AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset],
-    [AC_LINK_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <langinfo.h>]],
-          [[char* cs = nl_langinfo(CODESET); return !cs;]])],
-       [am_cv_langinfo_codeset=yes],
-       [am_cv_langinfo_codeset=no])
-    ])
-  if test $am_cv_langinfo_codeset = yes; then
-    AC_DEFINE([HAVE_LANGINFO_CODESET], [1],
-      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
-  fi
-])
diff --git a/m4/extensions.m4 b/m4/extensions.m4
@@ -1,118 +0,0 @@
-# serial 9  -*- Autoconf -*-
-# Enable extensions on systems that normally disable them.
-
-# Copyright (C) 2003, 2006-2011 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from CVS
-# Autoconf.  Perhaps we can remove this once we can assume Autoconf
-# 2.62 or later everywhere, but since CVS Autoconf mutates rapidly
-# enough in this area it's likely we'll need to redefine
-# AC_USE_SYSTEM_EXTENSIONS for quite some time.
-
-# If autoconf reports a warning
-#     warning: AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS
-# or  warning: AC_RUN_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS
-# the fix is
-#   1) to ensure that AC_USE_SYSTEM_EXTENSIONS is never directly invoked
-#      but always AC_REQUIREd,
-#   2) to ensure that for each occurrence of
-#        AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-#      or
-#        AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-#      the corresponding gnulib module description has 'extensions' among
-#      its dependencies. This will ensure that the gl_USE_SYSTEM_EXTENSIONS
-#      invocation occurs in gl_EARLY, not in gl_INIT.
-
-# AC_USE_SYSTEM_EXTENSIONS
-# ------------------------
-# Enable extensions on systems that normally disable them,
-# typically due to standards-conformance issues.
-# Remember that #undef in AH_VERBATIM gets replaced with #define by
-# AC_DEFINE.  The goal here is to define all known feature-enabling
-# macros, then, if reports of conflicts are made, disable macros that
-# cause problems on some platforms (such as __EXTENSIONS__).
-AC_DEFUN_ONCE([AC_USE_SYSTEM_EXTENSIONS],
-[AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
-AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
-
-  AC_REQUIRE([AC_CANONICAL_HOST])
-
-  AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=])
-  if test "$MINIX" = yes; then
-    AC_DEFINE([_POSIX_SOURCE], [1],
-      [Define to 1 if you need to in order for `stat' and other
-       things to work.])
-    AC_DEFINE([_POSIX_1_SOURCE], [2],
-      [Define to 2 if the system does not provide POSIX.1 features
-       except with this defined.])
-    AC_DEFINE([_MINIX], [1],
-      [Define to 1 if on MINIX.])
-  fi
-
-  dnl HP-UX 11.11 defines mbstate_t only if _XOPEN_SOURCE is defined to 500,
-  dnl regardless of whether the flags -Ae or _D_HPUX_SOURCE=1 are already
-  dnl provided.
-  case "$host_os" in
-    hpux*)
-      AC_DEFINE([_XOPEN_SOURCE], [500],
-        [Define to 500 only on HP-UX.])
-      ;;
-  esac
-
-  AH_VERBATIM([__EXTENSIONS__],
-[/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-])
-  AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__],
-    [ac_cv_safe_to_define___extensions__],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM([[
-#         define __EXTENSIONS__ 1
-          ]AC_INCLUDES_DEFAULT])],
-       [ac_cv_safe_to_define___extensions__=yes],
-       [ac_cv_safe_to_define___extensions__=no])])
-  test $ac_cv_safe_to_define___extensions__ = yes &&
-    AC_DEFINE([__EXTENSIONS__])
-  AC_DEFINE([_ALL_SOURCE])
-  AC_DEFINE([_GNU_SOURCE])
-  AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
-  AC_DEFINE([_TANDEM_SOURCE])
-])# AC_USE_SYSTEM_EXTENSIONS
-
-# gl_USE_SYSTEM_EXTENSIONS
-# ------------------------
-# Enable extensions on systems that normally disable them,
-# typically due to standards-conformance issues.
-AC_DEFUN_ONCE([gl_USE_SYSTEM_EXTENSIONS],
-[
-  dnl Require this macro before AC_USE_SYSTEM_EXTENSIONS.
-  dnl gnulib does not need it. But if it gets required by third-party macros
-  dnl after AC_USE_SYSTEM_EXTENSIONS is required, autoconf 2.62..2.63 emit a
-  dnl warning: "AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS".
-  dnl Note: We can do this only for one of the macros AC_AIX, AC_GNU_SOURCE,
-  dnl AC_MINIX. If people still use AC_AIX or AC_MINIX, they are out of luck.
-  AC_REQUIRE([AC_GNU_SOURCE])
-
-  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-])
diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4
@@ -1,70 +0,0 @@
-dnl 'extern inline' a la ISO C99.
-
-dnl Copyright 2012-2013 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_EXTERN_INLINE],
-[
-  AH_VERBATIM([extern_inline],
-[/* Please see the Gnulib manual for how to use these macros.
-
-   Suppress extern inline with HP-UX cc, as it appears to be broken; see
-   <http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>.
-
-   Suppress extern inline with Sun C in standards-conformance mode, as it
-   mishandles inline functions that call each other.  E.g., for 'inline void f
-   (void) { } inline void g (void) { f (); }', c99 incorrectly complains
-   'reference to static identifier "f" in extern inline function'.
-   This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16.
-
-   Suppress the use of extern inline on Apple's platforms, as Libc at least
-   through Libc-825.26 (2013-04-09) is incompatible with it; see, e.g.,
-   <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>.
-   Perhaps Apple will fix this some day.  */
-#if ((__GNUC__ \
-      ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
-      : (199901L <= __STDC_VERSION__ \
-         && !defined __HP_cc \
-         && !(defined __SUNPRO_C && __STDC__))) \
-     && !defined __APPLE__)
-# define _GL_INLINE inline
-# define _GL_EXTERN_INLINE extern inline
-#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \
-       && !defined __APPLE__)
-# if __GNUC_GNU_INLINE__
-   /* __gnu_inline__ suppresses a GCC 4.2 diagnostic.  */
-#  define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
-# else
-#  define _GL_INLINE extern inline
-# endif
-# define _GL_EXTERN_INLINE extern
-#else
-# define _GL_INLINE static _GL_UNUSED
-# define _GL_EXTERN_INLINE static _GL_UNUSED
-#endif
-
-#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
-# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__
-#  define _GL_INLINE_HEADER_CONST_PRAGMA
-# else
-#  define _GL_INLINE_HEADER_CONST_PRAGMA \
-     _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"")
-# endif
-  /* Suppress GCC's bogus "no previous prototype for 'FOO'"
-     and "no previous declaration for 'FOO'"  diagnostics,
-     when FOO is an inline function in the header; see
-     <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>.  */
-# define _GL_INLINE_HEADER_BEGIN \
-    _Pragma ("GCC diagnostic push") \
-    _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \
-    _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"") \
-    _GL_INLINE_HEADER_CONST_PRAGMA
-# define _GL_INLINE_HEADER_END \
-    _Pragma ("GCC diagnostic pop")
-#else
-# define _GL_INLINE_HEADER_BEGIN
-# define _GL_INLINE_HEADER_END
-#endif])
-])
diff --git a/m4/fcntl-o.m4 b/m4/fcntl-o.m4
@@ -1,134 +0,0 @@
-# fcntl-o.m4 serial 4
-dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl Written by Paul Eggert.
-
-# Test whether the flags O_NOATIME and O_NOFOLLOW actually work.
-# Define HAVE_WORKING_O_NOATIME to 1 if O_NOATIME works, or to 0 otherwise.
-# Define HAVE_WORKING_O_NOFOLLOW to 1 if O_NOFOLLOW works, or to 0 otherwise.
-AC_DEFUN([gl_FCNTL_O_FLAGS],
-[
-  dnl Persuade glibc <fcntl.h> to define O_NOATIME and O_NOFOLLOW.
-  dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes
-  dnl AC_GNU_SOURCE.
-  m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
-    [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])],
-    [AC_REQUIRE([AC_GNU_SOURCE])])
-
-  AC_CHECK_HEADERS_ONCE([unistd.h])
-  AC_CHECK_FUNCS_ONCE([symlink])
-  AC_CACHE_CHECK([for working fcntl.h], [gl_cv_header_working_fcntl_h],
-    [AC_RUN_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <sys/types.h>
-           #include <sys/stat.h>
-           #if HAVE_UNISTD_H
-           # include <unistd.h>
-           #else /* on Windows with MSVC */
-           # include <io.h>
-           # include <stdlib.h>
-           # defined sleep(n) _sleep ((n) * 1000)
-           #endif
-           #include <fcntl.h>
-           #ifndef O_NOATIME
-            #define O_NOATIME 0
-           #endif
-           #ifndef O_NOFOLLOW
-            #define O_NOFOLLOW 0
-           #endif
-           static int const constants[] =
-            {
-              O_CREAT, O_EXCL, O_NOCTTY, O_TRUNC, O_APPEND,
-              O_NONBLOCK, O_SYNC, O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY
-            };
-          ]],
-          [[
-            int result = !constants;
-            #if HAVE_SYMLINK
-            {
-              static char const sym[] = "conftest.sym";
-              if (symlink ("/dev/null", sym) != 0)
-                result |= 2;
-              else
-                {
-                  int fd = open (sym, O_WRONLY | O_NOFOLLOW | O_CREAT, 0);
-                  if (fd >= 0)
-                    {
-                      close (fd);
-                      result |= 4;
-                    }
-                }
-              if (unlink (sym) != 0 || symlink (".", sym) != 0)
-                result |= 2;
-              else
-                {
-                  int fd = open (sym, O_RDONLY | O_NOFOLLOW);
-                  if (fd >= 0)
-                    {
-                      close (fd);
-                      result |= 4;
-                    }
-                }
-              unlink (sym);
-            }
-            #endif
-            {
-              static char const file[] = "confdefs.h";
-              int fd = open (file, O_RDONLY | O_NOATIME);
-              if (fd < 0)
-                result |= 8;
-              else
-                {
-                  struct stat st0;
-                  if (fstat (fd, &st0) != 0)
-                    result |= 16;
-                  else
-                    {
-                      char c;
-                      sleep (1);
-                      if (read (fd, &c, 1) != 1)
-                        result |= 24;
-                      else
-                        {
-                          if (close (fd) != 0)
-                            result |= 32;
-                          else
-                            {
-                              struct stat st1;
-                              if (stat (file, &st1) != 0)
-                                result |= 40;
-                              else
-                                if (st0.st_atime != st1.st_atime)
-                                  result |= 64;
-                            }
-                        }
-                    }
-                }
-            }
-            return result;]])],
-       [gl_cv_header_working_fcntl_h=yes],
-       [case $? in #(
-        4) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
-        64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
-        68) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
-         *) gl_cv_header_working_fcntl_h='no';;
-        esac],
-       [gl_cv_header_working_fcntl_h=cross-compiling])])
-
-  case $gl_cv_header_working_fcntl_h in #(
-  *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
-  *) ac_val=1;;
-  esac
-  AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOATIME], [$ac_val],
-    [Define to 1 if O_NOATIME works.])
-
-  case $gl_cv_header_working_fcntl_h in #(
-  *O_NOFOLLOW* | no | cross-compiling) ac_val=0;; #(
-  *) ac_val=1;;
-  esac
-  AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOFOLLOW], [$ac_val],
-    [Define to 1 if O_NOFOLLOW works.])
-])
diff --git a/m4/freetype2.m4 b/m4/freetype2.m4
@@ -1,178 +0,0 @@
-# Configure paths for FreeType2
-# Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor
-#
-# serial 2
-
-# AC_CHECK_FT2([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-# Test for FreeType 2, and define FT2_CFLAGS and FT2_LIBS.
-# MINIMUM-VERSION is what libtool reports; the default is `7.0.1' (this is
-# FreeType 2.0.4).
-#
-AC_DEFUN([AC_CHECK_FT2],
-  [# Get the cflags and libraries from the freetype-config script
-   #
-   AC_ARG_WITH([ft-prefix],
-     dnl don't quote AS_HELP_STRING!
-     AS_HELP_STRING([--with-ft-prefix=PREFIX],
-                    [Prefix where FreeType is installed (optional)]),
-     [ft_config_prefix="$withval"],
-     [ft_config_prefix=""])
-
-   AC_ARG_WITH([ft-exec-prefix],
-     dnl don't quote AS_HELP_STRING!
-     AS_HELP_STRING([--with-ft-exec-prefix=PREFIX],
-                    [Exec prefix where FreeType is installed (optional)]),
-     [ft_config_exec_prefix="$withval"],
-     [ft_config_exec_prefix=""])
-
-   AC_ARG_ENABLE([freetypetest],
-     dnl don't quote AS_HELP_STRING!
-     AS_HELP_STRING([--disable-freetypetest],
-                    [Do not try to compile and run a test FreeType program]),
-     [],
-     [enable_fttest=yes])
-
-   if test x$ft_config_exec_prefix != x ; then
-     ft_config_args="$ft_config_args --exec-prefix=$ft_config_exec_prefix"
-     if test x${FT2_CONFIG+set} != xset ; then
-       FT2_CONFIG=$ft_config_exec_prefix/bin/freetype-config
-     fi
-   fi
-
-   if test x$ft_config_prefix != x ; then
-     ft_config_args="$ft_config_args --prefix=$ft_config_prefix"
-     if test x${FT2_CONFIG+set} != xset ; then
-       FT2_CONFIG=$ft_config_prefix/bin/freetype-config
-     fi
-   fi
-
-   AC_PATH_PROG([FT2_CONFIG], [freetype-config], [no])
-
-   min_ft_version=m4_if([$1], [], [7.0.1], [$1])
-   AC_MSG_CHECKING([for FreeType -- version >= $min_ft_version])
-   no_ft=""
-   if test "$FT2_CONFIG" = "no" ; then
-     no_ft=yes
-   else
-     FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
-     FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
-     ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
-       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-     ft_config_minor_version=`$FT2_CONFIG $ft_config_args --version | \
-       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-     ft_config_micro_version=`$FT2_CONFIG $ft_config_args --version | \
-       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-     ft_min_major_version=`echo $min_ft_version | \
-       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-     ft_min_minor_version=`echo $min_ft_version | \
-       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-     ft_min_micro_version=`echo $min_ft_version | \
-       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-     if test x$enable_fttest = xyes ; then
-       ft_config_is_lt=""
-       if test $ft_config_major_version -lt $ft_min_major_version ; then
-         ft_config_is_lt=yes
-       else
-         if test $ft_config_major_version -eq $ft_min_major_version ; then
-           if test $ft_config_minor_version -lt $ft_min_minor_version ; then
-             ft_config_is_lt=yes
-           else
-             if test $ft_config_minor_version -eq $ft_min_minor_version ; then
-               if test $ft_config_micro_version -lt $ft_min_micro_version ; then
-                 ft_config_is_lt=yes
-               fi
-             fi
-           fi
-         fi
-       fi
-       if test x$ft_config_is_lt = xyes ; then
-         no_ft=yes
-       else
-         ac_save_CFLAGS="$CFLAGS"
-         ac_save_LIBS="$LIBS"
-         CFLAGS="$CFLAGS $FT2_CFLAGS"
-         LIBS="$FT2_LIBS $LIBS"
-
-         #
-         # Sanity checks for the results of freetype-config to some extent.
-         #
-         AC_RUN_IFELSE([
-             AC_LANG_SOURCE([[
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main()
-{
-  FT_Library library;
-  FT_Error  error;
-
-  error = FT_Init_FreeType(&library);
-
-  if (error)
-    return 1;
-  else
-  {
-    FT_Done_FreeType(library);
-    return 0;
-  }
-}
-
-             ]])
-           ],
-           [],
-           [no_ft=yes],
-           [echo $ECHO_N "cross compiling; assuming OK... $ECHO_C"])
-
-         CFLAGS="$ac_save_CFLAGS"
-         LIBS="$ac_save_LIBS"
-       fi             # test $ft_config_version -lt $ft_min_version
-     fi               # test x$enable_fttest = xyes
-   fi                 # test "$FT2_CONFIG" = "no"
-
-   if test x$no_ft = x ; then
-     AC_MSG_RESULT([yes])
-     m4_if([$2], [], [:], [$2])
-   else
-     AC_MSG_RESULT([no])
-     if test "$FT2_CONFIG" = "no" ; then
-       AC_MSG_WARN([
-
-  The freetype-config script installed by FreeType 2 could not be found.
-  If FreeType 2 was installed in PREFIX, make sure PREFIX/bin is in
-  your path, or set the FT2_CONFIG environment variable to the
-  full path to freetype-config.
-       ])
-     else
-       if test x$ft_config_is_lt = xyes ; then
-         AC_MSG_WARN([
-
-  Your installed version of the FreeType 2 library is too old.
-  If you have different versions of FreeType 2, make sure that
-  correct values for --with-ft-prefix or --with-ft-exec-prefix
-  are used, or set the FT2_CONFIG environment variable to the
-  full path to freetype-config.
-         ])
-       else
-         AC_MSG_WARN([
-
-  The FreeType test program failed to run.  If your system uses
-  shared libraries and they are installed outside the normal
-  system library path, make sure the variable LD_LIBRARY_PATH
-  (or whatever is appropriate for your system) is correctly set.
-         ])
-       fi
-     fi
-
-     FT2_CFLAGS=""
-     FT2_LIBS=""
-     m4_if([$3], [], [:], [$3])
-   fi
-
-   AC_SUBST([FT2_CFLAGS])
-   AC_SUBST([FT2_LIBS])])
-
-# end of freetype2.m4
diff --git a/m4/gettext.m4 b/m4/gettext.m4
@@ -1,386 +0,0 @@
-# gettext.m4 serial 71 (gettext-0.20.2)
-dnl Copyright (C) 1995-2014, 2016, 2018-2020 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Lesser General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Lesser General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
-
-dnl Macro to add for using GNU gettext.
-
-dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
-dnl INTLSYMBOL must be one of 'external', 'use-libtool'.
-dnl    INTLSYMBOL should be 'external' for packages other than GNU gettext, and
-dnl    'use-libtool' for the packages 'gettext-runtime' and 'gettext-tools'.
-dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
-dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
-dnl    depending on --{enable,disable}-{shared,static} and on the presence of
-dnl    AM-DISABLE-SHARED).
-dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
-dnl    implementations (in libc or libintl) without the ngettext() function
-dnl    will be ignored.  If NEEDSYMBOL is specified and is
-dnl    'need-formatstring-macros', then GNU gettext implementations that don't
-dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
-dnl INTLDIR is used to find the intl libraries.  If empty,
-dnl    the value '$(top_builddir)/intl/' is used.
-dnl
-dnl The result of the configuration is one of three cases:
-dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
-dnl    and used.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 2) GNU gettext has been found in the system's C library.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 3) No internationalization, always use English msgid.
-dnl    Catalog format: none
-dnl    Catalog extension: none
-dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
-dnl The use of .gmo is historical (it was needed to avoid overwriting the
-dnl GNU format catalogs when building on a platform with an X/Open gettext),
-dnl but we keep it in order not to force irrelevant filename changes on the
-dnl maintainers.
-dnl
-AC_DEFUN([AM_GNU_GETTEXT],
-[
-  dnl Argument checking.
-  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [use-libtool], ,
-    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
-])])])])
-  ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
-    [errprint([ERROR: Use of AM_GNU_GETTEXT without [external] argument is no longer supported.
-])])
-  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
-    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-])])])])
-  define([gt_included_intl],
-    ifelse([$1], [external], [no], [yes]))
-  gt_NEEDS_INIT
-  AM_GNU_GETTEXT_NEED([$2])
-
-  AC_REQUIRE([AM_PO_SUBDIRS])dnl
-  ifelse(gt_included_intl, yes, [
-    AC_REQUIRE([AM_INTL_SUBDIR])dnl
-  ])
-
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Sometimes libintl requires libiconv, so first search for libiconv.
-  dnl Ideally we would do this search only after the
-  dnl      if test "$USE_NLS" = "yes"; then
-  dnl        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
-  dnl the configure script would need to contain the same shell code
-  dnl again, outside any 'if'. There are two solutions:
-  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
-  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
-  dnl Since AC_PROVIDE_IFELSE is not documented, we avoid it.
-  ifelse(gt_included_intl, yes, , [
-    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-  ])
-
-  dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
-  gt_INTL_MACOSX
-
-  dnl Set USE_NLS.
-  AC_REQUIRE([AM_NLS])
-
-  ifelse(gt_included_intl, yes, [
-    BUILD_INCLUDED_LIBINTL=no
-    USE_INCLUDED_LIBINTL=no
-  ])
-  LIBINTL=
-  LTLIBINTL=
-  POSUB=
-
-  dnl Add a version number to the cache macros.
-  case " $gt_needs " in
-    *" need-formatstring-macros "*) gt_api_version=3 ;;
-    *" need-ngettext "*) gt_api_version=2 ;;
-    *) gt_api_version=1 ;;
-  esac
-  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
-  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
-
-  dnl If we use NLS figure out what method
-  if test "$USE_NLS" = "yes"; then
-    gt_use_preinstalled_gnugettext=no
-    ifelse(gt_included_intl, yes, [
-      AC_MSG_CHECKING([whether included gettext is requested])
-      AC_ARG_WITH([included-gettext],
-        [  --with-included-gettext use the GNU gettext library included here],
-        nls_cv_force_use_gnu_gettext=$withval,
-        nls_cv_force_use_gnu_gettext=no)
-      AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
-
-      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-    ])
-        dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If GNU gettext is available we use this.  Else we have
-        dnl to fall back to GNU NLS library.
-
-        if test $gt_api_version -ge 3; then
-          gt_revision_test_code='
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-'
-        else
-          gt_revision_test_code=
-        fi
-        if test $gt_api_version -ge 2; then
-          gt_expression_test_code=' + * ngettext ("", "", 0)'
-        else
-          gt_expression_test_code=
-        fi
-
-        AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
-         [AC_LINK_IFELSE(
-            [AC_LANG_PROGRAM(
-               [[
-#include <libintl.h>
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
-#else
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
-#endif
-$gt_revision_test_code
-               ]],
-               [[
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
-               ]])],
-            [eval "$gt_func_gnugettext_libc=yes"],
-            [eval "$gt_func_gnugettext_libc=no"])])
-
-        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-          dnl Sometimes libintl requires libiconv, so first search for libiconv.
-          ifelse(gt_included_intl, yes, , [
-            AM_ICONV_LINK
-          ])
-          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
-          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
-          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
-          dnl even if libiconv doesn't exist.
-          AC_LIB_LINKFLAGS_BODY([intl])
-          AC_CACHE_CHECK([for GNU gettext in libintl],
-            [$gt_func_gnugettext_libintl],
-           [gt_save_CPPFLAGS="$CPPFLAGS"
-            CPPFLAGS="$CPPFLAGS $INCINTL"
-            gt_save_LIBS="$LIBS"
-            LIBS="$LIBS $LIBINTL"
-            dnl Now see whether libintl exists and does not depend on libiconv.
-            AC_LINK_IFELSE(
-              [AC_LANG_PROGRAM(
-                 [[
-#include <libintl.h>
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
-#else
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
-#endif
-$gt_revision_test_code
-                 ]],
-                 [[
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
-                 ]])],
-              [eval "$gt_func_gnugettext_libintl=yes"],
-              [eval "$gt_func_gnugettext_libintl=no"])
-            dnl Now see whether libintl exists and depends on libiconv.
-            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
-              AC_LINK_IFELSE(
-                [AC_LANG_PROGRAM(
-                   [[
-#include <libintl.h>
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
-#else
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
-#endif
-$gt_revision_test_code
-                   ]],
-                   [[
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
-                   ]])],
-                [LIBINTL="$LIBINTL $LIBICONV"
-                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                 eval "$gt_func_gnugettext_libintl=yes"
-                ])
-            fi
-            CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS"])
-        fi
-
-        dnl If an already present or preinstalled GNU gettext() is found,
-        dnl use it.  But if this macro is used in GNU gettext, and GNU
-        dnl gettext is already preinstalled in libintl, we update this
-        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
-           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
-                && test "$PACKAGE" != gettext-runtime \
-                && test "$PACKAGE" != gettext-tools; }; then
-          gt_use_preinstalled_gnugettext=yes
-        else
-          dnl Reset the values set by searching for libintl.
-          LIBINTL=
-          LTLIBINTL=
-          INCINTL=
-        fi
-
-    ifelse(gt_included_intl, yes, [
-        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
-          dnl GNU gettext is not found in the C library.
-          dnl Fall back on included GNU gettext library.
-          nls_cv_use_gnu_gettext=yes
-        fi
-      fi
-
-      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions used to generate GNU NLS library.
-        BUILD_INCLUDED_LIBINTL=yes
-        USE_INCLUDED_LIBINTL=yes
-        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LIBICONV $LIBTHREAD"
-        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LTLIBICONV $LTLIBTHREAD"
-        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-      fi
-
-      CATOBJEXT=
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions to use GNU gettext tools.
-        CATOBJEXT=.gmo
-      fi
-    ])
-
-    if test -n "$INTL_MACOSX_LIBS"; then
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Some extra flags are needed during linking.
-        LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
-        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
-      fi
-    fi
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes" \
-       || test "$nls_cv_use_gnu_gettext" = "yes"; then
-      AC_DEFINE([ENABLE_NLS], [1],
-        [Define to 1 if translation of program messages to the user's native language
-   is requested.])
-    else
-      USE_NLS=no
-    fi
-  fi
-
-  AC_MSG_CHECKING([whether to use NLS])
-  AC_MSG_RESULT([$USE_NLS])
-  if test "$USE_NLS" = "yes"; then
-    AC_MSG_CHECKING([where the gettext function comes from])
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        gt_source="external libintl"
-      else
-        gt_source="libc"
-      fi
-    else
-      gt_source="included intl directory"
-    fi
-    AC_MSG_RESULT([$gt_source])
-  fi
-
-  if test "$USE_NLS" = "yes"; then
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        AC_MSG_CHECKING([how to link with libintl])
-        AC_MSG_RESULT([$LIBINTL])
-        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
-      fi
-
-      dnl For backward compatibility. Some packages may be using this.
-      AC_DEFINE([HAVE_GETTEXT], [1],
-       [Define if the GNU gettext() function is already present or preinstalled.])
-      AC_DEFINE([HAVE_DCGETTEXT], [1],
-       [Define if the GNU dcgettext() function is already present or preinstalled.])
-    fi
-
-    dnl We need to process the po/ directory.
-    POSUB=po
-  fi
-
-  ifelse(gt_included_intl, yes, [
-    dnl In GNU gettext we have to set BUILD_INCLUDED_LIBINTL to 'yes'
-    dnl because some of the testsuite requires it.
-    BUILD_INCLUDED_LIBINTL=yes
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST([BUILD_INCLUDED_LIBINTL])
-    AC_SUBST([USE_INCLUDED_LIBINTL])
-    AC_SUBST([CATOBJEXT])
-  ])
-
-  dnl For backward compatibility. Some Makefiles may be using this.
-  INTLLIBS="$LIBINTL"
-  AC_SUBST([INTLLIBS])
-
-  dnl Make all documented variables known to autoconf.
-  AC_SUBST([LIBINTL])
-  AC_SUBST([LTLIBINTL])
-  AC_SUBST([POSUB])
-])
-
-
-dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
-m4_define([gt_NEEDS_INIT],
-[
-  m4_divert_text([DEFAULTS], [gt_needs=])
-  m4_define([gt_NEEDS_INIT], [])
-])
-
-
-dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
-AC_DEFUN([AM_GNU_GETTEXT_NEED],
-[
-  m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
-])
-
-
-dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
-AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
-
-
-dnl Usage: AM_GNU_GETTEXT_REQUIRE_VERSION([gettext-version])
-AC_DEFUN([AM_GNU_GETTEXT_REQUIRE_VERSION], [])
diff --git a/m4/glib-2.0.m4 b/m4/glib-2.0.m4
@@ -1,212 +0,0 @@
-# Configure paths for GLIB
-# Owen Taylor     1997-2001
-
-dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or
-dnl gthread is specified in MODULES, pass to pkg-config
-dnl
-AC_DEFUN([AM_PATH_GLIB_2_0],
-[dnl
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(glibtest, [  --disable-glibtest      do not try to compile and run a test GLIB program],
-		    , enable_glibtest=yes)
-
-  pkg_config_args=glib-2.0
-  for module in . $4
-  do
-      case "$module" in
-         gmodule)
-             pkg_config_args="$pkg_config_args gmodule-2.0"
-         ;;
-         gobject)
-             pkg_config_args="$pkg_config_args gobject-2.0"
-         ;;
-         gthread)
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-      esac
-  done
-
-  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
-  no_glib=""
-
-  if test x$PKG_CONFIG != xno ; then
-    if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
-      :
-    else
-      echo *** pkg-config too old; version 0.7 or better required.
-      no_glib=yes
-      PKG_CONFIG=no
-    fi
-  else
-    no_glib=yes
-  fi
-
-  min_glib_version=ifelse([$1], ,2.0.0,$1)
-  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-
-  if test x$PKG_CONFIG != xno ; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-	  echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
-	  enable_glibtest=no
-    fi
-
-    if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
-	  :
-    else
-	  no_glib=yes
-    fi
-  fi
-
-  if test x"$no_glib" = x ; then
-    GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-    GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
-    GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-
-    GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
-    GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
-    glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_glibtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GLIB_CFLAGS"
-      LIBS="$GLIB_LIBS $LIBS"
-dnl
-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
-      rm -f conf.glibtest
-      AC_TRY_RUN([
-#include <glib.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.glibtest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_glib_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_glib_version");
-     exit(1);
-   }
-
-  if ((glib_major_version != $glib_config_major_version) ||
-      (glib_minor_version != $glib_config_minor_version) ||
-      (glib_micro_version != $glib_config_micro_version))
-    {
-      printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
-             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
-             glib_major_version, glib_minor_version, glib_micro_version);
-      printf ("*** was found! If pkg-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-      printf("*** to point to the correct configuration files\n");
-    }
-  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
-	   (glib_minor_version != GLIB_MINOR_VERSION) ||
-           (glib_micro_version != GLIB_MICRO_VERSION))
-    {
-      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
-	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     glib_major_version, glib_minor_version, glib_micro_version);
-    }
-  else
-    {
-      if ((glib_major_version > major) ||
-        ((glib_major_version == major) && (glib_minor_version > minor)) ||
-        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
-               glib_major_version, glib_minor_version, glib_micro_version);
-        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
-        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_glib" = x ; then
-     AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
-     ifelse([$2], , :, [$2])
-  else
-     AC_MSG_RESULT(no)
-     if test "$PKG_CONFIG" = "no" ; then
-       echo "*** A new enough version of pkg-config was not found."
-       echo "*** See http://www.freedesktop.org/software/pkgconfig/"
-     else
-       if test -f conf.glibtest ; then
-        :
-       else
-          echo "*** Could not run GLIB test program, checking why..."
-          ac_save_CFLAGS="$CFLAGS"
-          ac_save_LIBS="$LIBS"
-          CFLAGS="$CFLAGS $GLIB_CFLAGS"
-          LIBS="$LIBS $GLIB_LIBS"
-          AC_TRY_LINK([
-#include <glib.h>
-#include <stdio.h>
-],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occurred. This usually means GLIB is incorrectly installed."])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GLIB_CFLAGS=""
-     GLIB_LIBS=""
-     GLIB_GENMARSHAL=""
-     GOBJECT_QUERY=""
-     GLIB_MKENUMS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GLIB_CFLAGS)
-  AC_SUBST(GLIB_LIBS)
-  AC_SUBST(GLIB_GENMARSHAL)
-  AC_SUBST(GOBJECT_QUERY)
-  AC_SUBST(GLIB_MKENUMS)
-  rm -f conf.glibtest
-])
diff --git a/m4/glib-gettext.m4 b/m4/glib-gettext.m4
@@ -1,380 +0,0 @@
-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
-# Copyright (C) 2001-2003 Red Hat, Inc.
-#
-# This file is free software, distributed under the terms of the GNU
-# General Public License.  As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
-# the same distribution terms as the rest of that program.
-#
-# This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-#
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
-#
-# Modified to never use included libintl. 
-# Owen Taylor <otaylor@redhat.com>, 12/15/1998
-#
-# Major rework to remove unused code
-# Owen Taylor <otaylor@redhat.com>, 12/11/2002
-#
-# Added better handling of ALL_LINGUAS from GNU gettext version 
-# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
-
-#
-# We need this here as well, since someone might use autoconf-2.5x
-# to configure GLib then an older version to configure a package
-# using AM_GLIB_GNU_GETTEXT
-AC_PREREQ(2.53)
-
-dnl
-dnl We go to great lengths to make sure that aclocal won't 
-dnl try to pull in the installed version of these macros
-dnl when running aclocal in the glib directory.
-dnl
-m4_copy([AC_DEFUN],[glib_DEFUN])
-m4_copy([AC_REQUIRE],[glib_REQUIRE])
-dnl
-dnl At the end, if we're not within glib, we'll define the public
-dnl definitions in terms of our private definitions.
-dnl
-
-# GLIB_LC_MESSAGES
-#--------------------
-glib_DEFUN([GLIB_LC_MESSAGES],
-  [AC_CHECK_HEADERS([locale.h])
-    if test $ac_cv_header_locale_h = yes; then
-    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES, 1,
-        [Define if your <locale.h> file defines LC_MESSAGES.])
-    fi
-  fi])
-
-# GLIB_PATH_PROG_WITH_TEST
-#----------------------------
-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-	ac_cv_path_$1="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-  ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-# GLIB_WITH_NLS
-#-----------------
-glib_DEFUN([GLIB_WITH_NLS],
-  dnl NLS is obligatory
-  [USE_NLS=yes
-    AC_SUBST(USE_NLS)
-
-    gt_cv_have_gettext=no
-
-    CATOBJEXT=NONE
-    XGETTEXT=:
-    INTLLIBS=
-
-    AC_CHECK_HEADER(libintl.h,
-     [gt_cv_func_dgettext_libintl="no"
-      libintl_extra_libs=""
-
-      #
-      # First check in libc
-      #
-      AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
-        [AC_TRY_LINK([
-#include <libintl.h>
-],
-          [return (int) dgettext ("","")],
-	  gt_cv_func_dgettext_libc=yes,
-          gt_cv_func_dgettext_libc=no)
-        ])
-  
-      if test "$gt_cv_func_dgettext_libc" = "yes" ; then
-        AC_CHECK_FUNCS(bind_textdomain_codeset)
-      fi
-
-      #
-      # If we don't have everything we want, check in libintl
-      #
-      if test "$gt_cv_func_dgettext_libc" != "yes" \
-         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-        
-        AC_CHECK_LIB(intl, bindtextdomain,
-	    [AC_CHECK_LIB(intl, dgettext,
-		          gt_cv_func_dgettext_libintl=yes)])
-
-	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-	  AC_MSG_CHECKING([if -liconv is needed to use gettext])
-	  AC_MSG_RESULT([])
-          AC_CHECK_LIB(intl, dcgettext,
-		       [gt_cv_func_dgettext_libintl=yes
-			libintl_extra_libs=-liconv],
-			:,-liconv)
-        fi
-
-        #
-        # If we found libintl, then check in it for bind_textdomain_codeset();
-        # we'll prefer libc if neither have bind_textdomain_codeset(),
-        # and both have dgettext
-        #
-        if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
-          glib_save_LIBS="$LIBS"
-          LIBS="$LIBS -lintl $libintl_extra_libs"
-          unset ac_cv_func_bind_textdomain_codeset
-          AC_CHECK_FUNCS(bind_textdomain_codeset)
-          LIBS="$glib_save_LIBS"
-
-          if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
-            gt_cv_func_dgettext_libc=no
-          else
-            if test "$gt_cv_func_dgettext_libc" = "yes"; then
-              gt_cv_func_dgettext_libintl=no
-            fi
-          fi
-        fi
-      fi
-
-      if test "$gt_cv_func_dgettext_libc" = "yes" \
-	|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        gt_cv_have_gettext=yes
-      fi
-  
-      if test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        INTLLIBS="-lintl $libintl_extra_libs"
-      fi
-  
-      if test "$gt_cv_have_gettext" = "yes"; then
-	AC_DEFINE(HAVE_GETTEXT,1,
-	  [Define if the GNU gettext() function is already present or preinstalled.])
-	GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-	if test "$MSGFMT" != "no"; then
-          glib_save_LIBS="$LIBS"
-          LIBS="$LIBS $INTLLIBS"
-	  AC_CHECK_FUNCS(dcgettext)
-	  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-	  GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-	    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-	  AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-			 return _nl_msg_cat_cntr],
-	    [CATOBJEXT=.gmo 
-             DATADIRNAME=share],
-	    [case $host in
-	    *-*-solaris*)
-	    dnl On Solaris, if bind_textdomain_codeset is in libc,
-	    dnl GNU format message catalog is always supported,
-            dnl since both are added to the libc all together.
-	    dnl Hence, we'd like to go with DATADIRNAME=share and
-	    dnl and CATOBJEXT=.gmo in this case.
-            AC_CHECK_FUNC(bind_textdomain_codeset,
-	      [CATOBJEXT=.gmo 
-               DATADIRNAME=share],
-	      [CATOBJEXT=.mo
-               DATADIRNAME=lib])
-	    ;;
-	    *)
-	    CATOBJEXT=.mo
-            DATADIRNAME=lib
-	    ;;
-	    esac])
-          LIBS="$glib_save_LIBS"
-	  INSTOBJEXT=.mo
-	else
-	  gt_cv_have_gettext=no
-	fi
-      fi
-    ])
-
-    if test "$gt_cv_have_gettext" = "yes" ; then
-      AC_DEFINE(ENABLE_NLS, 1,
-        [always defined to indicate that i18n is enabled])
-    fi
-
-    dnl Test whether we really found GNU xgettext.
-    if test "$XGETTEXT" != ":"; then
-      dnl If it is not GNU xgettext we define it as : so that the
-      dnl Makefiles still can work.
-      if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-        : ;
-      else
-        AC_MSG_RESULT(
-	  [found xgettext program is not GNU xgettext; ignore it])
-        XGETTEXT=":"
-      fi
-    fi
-
-    # We need to process the po/ directory.
-    POSUB=po
-
-    AC_OUTPUT_COMMANDS(
-      [case "$CONFIG_FILES" in *po/Makefile.in*)
-        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-      esac])
-
-    dnl These rules are solely for the distribution goal.  While doing this
-    dnl we only have to keep exactly one list of the available catalogs
-    dnl in configure.in.
-    for lang in $ALL_LINGUAS; do
-      GMOFILES="$GMOFILES $lang.gmo"
-      POFILES="$POFILES $lang.po"
-    done
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST(CATALOGS)
-    AC_SUBST(CATOBJEXT)
-    AC_SUBST(DATADIRNAME)
-    AC_SUBST(GMOFILES)
-    AC_SUBST(INSTOBJEXT)
-    AC_SUBST(INTLLIBS)
-    AC_SUBST(PO_IN_DATADIR_TRUE)
-    AC_SUBST(PO_IN_DATADIR_FALSE)
-    AC_SUBST(POFILES)
-    AC_SUBST(POSUB)
-  ])
-
-# AM_GLIB_GNU_GETTEXT
-# -------------------
-# Do checks necessary for use of gettext. If a suitable implementation 
-# of gettext is found in either in libintl or in the C library,
-# it will set INTLLIBS to the libraries needed for use of gettext
-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
-# on various variables needed by the Makefile.in.in installed by 
-# glib-gettextize.
-dnl
-glib_DEFUN([GLIB_GNU_GETTEXT],
-  [AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
-   
-   GLIB_LC_MESSAGES
-   GLIB_WITH_NLS
-
-   if test "$gt_cv_have_gettext" = "yes"; then
-     if test "x$ALL_LINGUAS" = "x"; then
-       LINGUAS=
-     else
-       AC_MSG_CHECKING(for catalogs to be installed)
-       NEW_LINGUAS=
-       for presentlang in $ALL_LINGUAS; do
-         useit=no
-         if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
-           desiredlanguages="$LINGUAS"
-         else
-           desiredlanguages="$ALL_LINGUAS"
-         fi
-         for desiredlang in $desiredlanguages; do
- 	   # Use the presentlang catalog if desiredlang is
-           #   a. equal to presentlang, or
-           #   b. a variant of presentlang (because in this case,
-           #      presentlang can be used as a fallback for messages
-           #      which are not translated in the desiredlang catalog).
-           case "$desiredlang" in
-             "$presentlang"*) useit=yes;;
-           esac
-         done
-         if test $useit = yes; then
-           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
-         fi
-       done
-       LINGUAS=$NEW_LINGUAS
-       AC_MSG_RESULT($LINGUAS)
-     fi
-
-     dnl Construct list of names of catalog files to be constructed.
-     if test -n "$LINGUAS"; then
-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-     fi
-   fi
-
-   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
-   dnl Try to locate is.
-   MKINSTALLDIRS=
-   if test -n "$ac_aux_dir"; then
-     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-   fi
-   if test -z "$MKINSTALLDIRS"; then
-     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-   fi
-   AC_SUBST(MKINSTALLDIRS)
-
-   dnl Generate list of files to be processed by xgettext which will
-   dnl be included in po/Makefile.
-   test -d po || mkdir po
-   if test "x$srcdir" != "x."; then
-     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-       posrcprefix="$srcdir/"
-     else
-       posrcprefix="../$srcdir/"
-     fi
-   else
-     posrcprefix="../"
-   fi
-   rm -f po/POTFILES
-   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-	< $srcdir/po/POTFILES.in > po/POTFILES
-  ])
-
-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
-# -------------------------------
-# Define VARIABLE to the location where catalog files will
-# be installed by po/Makefile.
-glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
-glib_save_prefix="$prefix"
-glib_save_exec_prefix="$exec_prefix"
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-if test "x$CATOBJEXT" = "x.mo" ; then
-  localedir=`eval echo "${libdir}/locale"`
-else
-  localedir=`eval echo "${datadir}/locale"`
-fi
-prefix="$glib_save_prefix"
-exec_prefix="$glib_save_exec_prefix"
-AC_DEFINE_UNQUOTED($1, "$localedir",
-  [Define the location where the catalogs will be installed])
-])
-
-dnl
-dnl Now the definitions that aclocal will find
-dnl
-ifdef(glib_configure_in,[],[
-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
-])dnl
diff --git a/m4/glibc2.m4 b/m4/glibc2.m4
@@ -1,31 +0,0 @@
-# glibc2.m4 serial 3
-dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2014 Free Software Foundation,
-dnl Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-# Test for the GNU C Library, version 2.0 or newer.
-# From Bruno Haible.
-
-AC_DEFUN([gt_GLIBC2],
-  [
-    AC_CACHE_CHECK([whether we are using the GNU C Library 2 or newer],
-      [ac_cv_gnu_library_2],
-      [AC_EGREP_CPP([Lucky GNU user],
-        [
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ >= 2) && !defined __UCLIBC__
-  Lucky GNU user
- #endif
-#endif
-        ],
-        [ac_cv_gnu_library_2=yes],
-        [ac_cv_gnu_library_2=no])
-      ]
-    )
-    AC_SUBST([GLIBC2])
-    GLIBC2="$ac_cv_gnu_library_2"
-  ]
-)
diff --git a/m4/glibc21.m4 b/m4/glibc21.m4
@@ -1,34 +0,0 @@
-# glibc21.m4 serial 5
-dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2014 Free Software Foundation,
-dnl Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-# Test for the GNU C Library, version 2.1 or newer, or uClibc.
-# From Bruno Haible.
-
-AC_DEFUN([gl_GLIBC21],
-  [
-    AC_CACHE_CHECK([whether we are using the GNU C Library >= 2.1 or uClibc],
-      [ac_cv_gnu_library_2_1],
-      [AC_EGREP_CPP([Lucky],
-        [
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
-  Lucky GNU user
- #endif
-#endif
-#ifdef __UCLIBC__
- Lucky user
-#endif
-        ],
-        [ac_cv_gnu_library_2_1=yes],
-        [ac_cv_gnu_library_2_1=no])
-      ]
-    )
-    AC_SUBST([GLIBC21])
-    GLIBC21="$ac_cv_gnu_library_2_1"
-  ]
-)
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
@@ -1,35 +0,0 @@
-# Copyright (C) 2002-2011 Free Software Foundation, Inc.
-#
-# This file is free software, distributed under the terms of the GNU
-# General Public License.  As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
-# the same distribution terms as the rest of that program.
-#
-# Generated by gnulib-tool.
-#
-# This file represents the specification of how gnulib-tool is used.
-# It acts as a cache: It is written and read by gnulib-tool.
-# In projects that use version control, this file is meant to be put under
-# version control, like the configure.ac and various Makefile.am files.
-
-
-# Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=/home/nils/workspace/gnunet --lib=libgnu --source-base=src/util/libgnu --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --libtool --macro-prefix=gl strtok_r
-
-# Specification in the form of a few gnulib-tool.m4 macro invocations:
-gl_LOCAL_DIR([])
-gl_MODULES([
-  strtok_r
-])
-gl_AVOID([])
-gl_SOURCE_BASE([src/util/libgnu])
-gl_M4_BASE([m4])
-gl_PO_BASE([])
-gl_DOC_BASE([doc])
-gl_TESTS_BASE([tests])
-gl_LIB([libgnu])
-gl_MAKEFILE_NAME([])
-gl_LIBTOOL
-gl_MACRO_PREFIX([gl])
-gl_PO_DOMAIN([])
diff --git a/m4/gtk-2.0.m4 b/m4/gtk-2.0.m4
@@ -1,196 +0,0 @@
-# Configure paths for GTK+
-# Owen Taylor     1997-2001
-
-dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
-dnl pass to pkg-config
-dnl
-AC_DEFUN([AM_PATH_GTK_2_0],
-[dnl
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run a test GTK+ program],
-		    , enable_gtktest=yes)
-
-  pkg_config_args=gtk+-2.0
-  for module in . $4
-  do
-      case "$module" in
-         gthread)
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-      esac
-  done
-
-  no_gtk=""
-
-  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
-  if test x$PKG_CONFIG != xno ; then
-    if pkg-config --atleast-pkgconfig-version 0.7 ; then
-      :
-    else
-      echo "*** pkg-config too old; version 0.7 or better required."
-      no_gtk=yes
-      PKG_CONFIG=no
-    fi
-  else
-    no_gtk=yes
-  fi
-
-  min_gtk_version=ifelse([$1], ,2.0.0,$1)
-  AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
-
-  if test x$PKG_CONFIG != xno ; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
-	  enable_gtktest=no
-    fi
-
-    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
-	  :
-    else
-	  no_gtk=yes
-    fi
-  fi
-
-  if test x"$no_gtk" = x ; then
-    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
-    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
-    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_gtktest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GTK_CFLAGS"
-      LIBS="$GTK_LIBS $LIBS"
-dnl
-dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
-      rm -f conf.gtktest
-      AC_TRY_RUN([
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.gtktest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_gtk_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
-
-  if ((gtk_major_version != $gtk_config_major_version) ||
-      (gtk_minor_version != $gtk_config_minor_version) ||
-      (gtk_micro_version != $gtk_config_micro_version))
-    {
-      printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
-             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-             gtk_major_version, gtk_minor_version, gtk_micro_version);
-      printf ("*** was found! If pkg-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-      printf("*** to point to the correct configuration files\n");
-    }
-  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-	   (gtk_minor_version != GTK_MINOR_VERSION) ||
-           (gtk_micro_version != GTK_MICRO_VERSION))
-    {
-      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     gtk_major_version, gtk_minor_version, gtk_micro_version);
-    }
-  else
-    {
-      if ((gtk_major_version > major) ||
-        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-               gtk_major_version, gtk_minor_version, gtk_micro_version);
-        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
-        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gtk" = x ; then
-     AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
-     ifelse([$2], , :, [$2])
-  else
-     AC_MSG_RESULT(no)
-     if test "$PKG_CONFIG" = "no" ; then
-       echo "*** A new enough version of pkg-config was not found."
-       echo "*** See http://pkgconfig.sourceforge.net"
-     else
-       if test -f conf.gtktest ; then
-        :
-       else
-          echo "*** Could not run GTK+ test program, checking why..."
-	  ac_save_CFLAGS="$CFLAGS"
-	  ac_save_LIBS="$LIBS"
-          CFLAGS="$CFLAGS $GTK_CFLAGS"
-          LIBS="$LIBS $GTK_LIBS"
-          AC_TRY_LINK([
-#include <gtk/gtk.h>
-#include <stdio.h>
-],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
-          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed."])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GTK_CFLAGS)
-  AC_SUBST(GTK_LIBS)
-  rm -f conf.gtktest
-])
diff --git a/m4/host-cpu-c-abi.m4 b/m4/host-cpu-c-abi.m4
@@ -1,675 +0,0 @@
-# host-cpu-c-abi.m4 serial 13
-dnl Copyright (C) 2002-2020 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible and Sam Steingold.
-
-dnl Sets the HOST_CPU variable to the canonical name of the CPU.
-dnl Sets the HOST_CPU_C_ABI variable to the canonical name of the CPU with its
-dnl C language ABI (application binary interface).
-dnl Also defines __${HOST_CPU}__ and __${HOST_CPU_C_ABI}__ as C macros in
-dnl config.h.
-dnl
-dnl This canonical name can be used to select a particular assembly language
-dnl source file that will interoperate with C code on the given host.
-dnl
-dnl For example:
-dnl * 'i386' and 'sparc' are different canonical names, because code for i386
-dnl   will not run on SPARC CPUs and vice versa. They have different
-dnl   instruction sets.
-dnl * 'sparc' and 'sparc64' are different canonical names, because code for
-dnl   'sparc' and code for 'sparc64' cannot be linked together: 'sparc' code
-dnl   contains 32-bit instructions, whereas 'sparc64' code contains 64-bit
-dnl   instructions. A process on a SPARC CPU can be in 32-bit mode or in 64-bit
-dnl   mode, but not both.
-dnl * 'mips' and 'mipsn32' are different canonical names, because they use
-dnl   different argument passing and return conventions for C functions, and
-dnl   although the instruction set of 'mips' is a large subset of the
-dnl   instruction set of 'mipsn32'.
-dnl * 'mipsn32' and 'mips64' are different canonical names, because they use
-dnl   different sizes for the C types like 'int' and 'void *', and although
-dnl   the instruction sets of 'mipsn32' and 'mips64' are the same.
-dnl * The same canonical name is used for different endiannesses. You can
-dnl   determine the endianness through preprocessor symbols:
-dnl   - 'arm': test __ARMEL__.
-dnl   - 'mips', 'mipsn32', 'mips64': test _MIPSEB vs. _MIPSEL.
-dnl   - 'powerpc64': test _BIG_ENDIAN vs. _LITTLE_ENDIAN.
-dnl * The same name 'i386' is used for CPUs of type i386, i486, i586
-dnl   (Pentium), AMD K7, Pentium II, Pentium IV, etc., because
-dnl   - Instructions that do not exist on all of these CPUs (cmpxchg,
-dnl     MMX, SSE, SSE2, 3DNow! etc.) are not frequently used. If your
-dnl     assembly language source files use such instructions, you will
-dnl     need to make the distinction.
-dnl   - Speed of execution of the common instruction set is reasonable across
-dnl     the entire family of CPUs. If you have assembly language source files
-dnl     that are optimized for particular CPU types (like GNU gmp has), you
-dnl     will need to make the distinction.
-dnl   See <https://en.wikipedia.org/wiki/X86_instruction_listings>.
-AC_DEFUN([gl_HOST_CPU_C_ABI],
-[
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([gl_C_ASM])
-  AC_CACHE_CHECK([host CPU and C ABI], [gl_cv_host_cpu_c_abi],
-    [case "$host_cpu" in
-
-changequote(,)dnl
-       i[34567]86 )
-changequote([,])dnl
-         gl_cv_host_cpu_c_abi=i386
-         ;;
-
-       x86_64 )
-         # On x86_64 systems, the C compiler may be generating code in one of
-         # these ABIs:
-         # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64.
-         # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64
-         #   with native Windows (mingw, MSVC).
-         # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32.
-         # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386.
-         AC_COMPILE_IFELSE(
-           [AC_LANG_SOURCE(
-              [[#if (defined __x86_64__ || defined __amd64__ \
-                     || defined _M_X64 || defined _M_AMD64)
-                 int ok;
-                #else
-                 error fail
-                #endif
-              ]])],
-           [AC_COMPILE_IFELSE(
-              [AC_LANG_SOURCE(
-                 [[#if defined __ILP32__ || defined _ILP32
-                    int ok;
-                   #else
-                    error fail
-                   #endif
-                 ]])],
-              [gl_cv_host_cpu_c_abi=x86_64-x32],
-              [gl_cv_host_cpu_c_abi=x86_64])],
-           [gl_cv_host_cpu_c_abi=i386])
-         ;;
-
-changequote(,)dnl
-       alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] )
-changequote([,])dnl
-         gl_cv_host_cpu_c_abi=alpha
-         ;;
-
-       arm* | aarch64 )
-         # Assume arm with EABI.
-         # On arm64 systems, the C compiler may be generating code in one of
-         # these ABIs:
-         # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64.
-         # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32.
-         # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf.
-         AC_COMPILE_IFELSE(
-           [AC_LANG_SOURCE(
-              [[#ifdef __aarch64__
-                 int ok;
-                #else
-                 error fail
-                #endif
-              ]])],
-           [AC_COMPILE_IFELSE(
-              [AC_LANG_SOURCE(
-                [[#if defined __ILP32__ || defined _ILP32
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                ]])],
-              [gl_cv_host_cpu_c_abi=arm64-ilp32],
-              [gl_cv_host_cpu_c_abi=arm64])],
-           [# Don't distinguish little-endian and big-endian arm, since they
-            # don't require different machine code for simple operations and
-            # since the user can distinguish them through the preprocessor
-            # defines __ARMEL__ vs. __ARMEB__.
-            # But distinguish arm which passes floating-point arguments and
-            # return values in integer registers (r0, r1, ...) - this is
-            # gcc -mfloat-abi=soft or gcc -mfloat-abi=softfp - from arm which
-            # passes them in float registers (s0, s1, ...) and double registers
-            # (d0, d1, ...) - this is gcc -mfloat-abi=hard. GCC 4.6 or newer
-            # sets the preprocessor defines __ARM_PCS (for the first case) and
-            # __ARM_PCS_VFP (for the second case), but older GCC does not.
-            echo 'double ddd; void func (double dd) { ddd = dd; }' > conftest.c
-            # Look for a reference to the register d0 in the .s file.
-            AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt conftest.c) >/dev/null 2>&1
-            if LC_ALL=C grep 'd0,' conftest.$gl_asmext >/dev/null; then
-              gl_cv_host_cpu_c_abi=armhf
-            else
-              gl_cv_host_cpu_c_abi=arm
-            fi
-            rm -f conftest*
-           ])
-         ;;
-
-       hppa1.0 | hppa1.1 | hppa2.0* | hppa64 )
-         # On hppa, the C compiler may be generating 32-bit code or 64-bit
-         # code. In the latter case, it defines _LP64 and __LP64__.
-         AC_COMPILE_IFELSE(
-           [AC_LANG_SOURCE(
-              [[#ifdef __LP64__
-                 int ok;
-                #else
-                 error fail
-                #endif
-              ]])],
-           [gl_cv_host_cpu_c_abi=hppa64],
-           [gl_cv_host_cpu_c_abi=hppa])
-         ;;
-
-       ia64* )
-         # On ia64 on HP-UX, the C compiler may be generating 64-bit code or
-         # 32-bit code. In the latter case, it defines _ILP32.
-         AC_COMPILE_IFELSE(
-           [AC_LANG_SOURCE(
-              [[#ifdef _ILP32
-                 int ok;
-                #else
-                 error fail
-                #endif
-              ]])],
-           [gl_cv_host_cpu_c_abi=ia64-ilp32],
-           [gl_cv_host_cpu_c_abi=ia64])
-         ;;
-
-       mips* )
-         # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this
-         # at 32.
-         AC_COMPILE_IFELSE(
-           [AC_LANG_SOURCE(
-              [[#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64)
-                 int ok;
-                #else
-                 error fail
-                #endif
-              ]])],
-           [gl_cv_host_cpu_c_abi=mips64],
-           [# In the n32 ABI, _ABIN32 is defined, _ABIO32 is not defined (but
-            # may later get defined by <sgidefs.h>), and _MIPS_SIM == _ABIN32.
-            # In the 32 ABI, _ABIO32 is defined, _ABIN32 is not defined (but
-            # may later get defined by <sgidefs.h>), and _MIPS_SIM == _ABIO32.
-            AC_COMPILE_IFELSE(
-              [AC_LANG_SOURCE(
-                 [[#if (_MIPS_SIM == _ABIN32)
-                    int ok;
-                   #else
-                    error fail
-                   #endif
-                 ]])],
-              [gl_cv_host_cpu_c_abi=mipsn32],
-              [gl_cv_host_cpu_c_abi=mips])])
-         ;;
-
-       powerpc* )
-         # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD.
-         # No need to distinguish them here; the caller may distinguish
-         # them based on the OS.
-         # On powerpc64 systems, the C compiler may still be generating
-         # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may
-         # be generating 64-bit code.
-         AC_COMPILE_IFELSE(
-           [AC_LANG_SOURCE(
-              [[#if defined __powerpc64__ || defined _ARCH_PPC64
-                 int ok;
-                #else
-                 error fail
-                #endif
-              ]])],
-           [# On powerpc64, there are two ABIs on Linux: The AIX compatible
-            # one and the ELFv2 one. The latter defines _CALL_ELF=2.
-            AC_COMPILE_IFELSE(
-              [AC_LANG_SOURCE(
-                 [[#if defined _CALL_ELF && _CALL_ELF == 2
-                    int ok;
-                   #else
-                    error fail
-                   #endif
-                 ]])],
-              [gl_cv_host_cpu_c_abi=powerpc64-elfv2],
-              [gl_cv_host_cpu_c_abi=powerpc64])
-           ],
-           [gl_cv_host_cpu_c_abi=powerpc])
-         ;;
-
-       rs6000 )
-         gl_cv_host_cpu_c_abi=powerpc
-         ;;
-
-       riscv32 | riscv64 )
-         # There are 2 architectures (with variants): rv32* and rv64*.
-         AC_COMPILE_IFELSE(
-           [AC_LANG_SOURCE(
-              [[#if __riscv_xlen == 64
-                  int ok;
-                #else
-                  error fail
-                #endif
-              ]])],
-           [cpu=riscv64],
-           [cpu=riscv32])
-         # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d.
-         # Size of 'long' and 'void *':
-         AC_COMPILE_IFELSE(
-           [AC_LANG_SOURCE(
-              [[#if defined __LP64__
-                  int ok;
-                #else
-                  error fail
-                #endif
-              ]])],
-           [main_abi=lp64],
-           [main_abi=ilp32])
-         # Float ABIs:
-         # __riscv_float_abi_double:
-         #   'float' and 'double' are passed in floating-point registers.
-         # __riscv_float_abi_single:
-         #   'float' are passed in floating-point registers.
-         # __riscv_float_abi_soft:
-         #   No values are passed in floating-point registers.
-         AC_COMPILE_IFELSE(
-           [AC_LANG_SOURCE(
-              [[#if defined __riscv_float_abi_double
-                  int ok;
-                #else
-                  error fail
-                #endif
-              ]])],
-           [float_abi=d],
-           [AC_COMPILE_IFELSE(
-              [AC_LANG_SOURCE(
-                 [[#if defined __riscv_float_abi_single
-                     int ok;
-                   #else
-                     error fail
-                   #endif
-                 ]])],
-              [float_abi=f],
-              [float_abi=''])
-           ])
-         gl_cv_host_cpu_c_abi="${cpu}-${main_abi}${float_abi}"
-         ;;
-
-       s390* )
-         # On s390x, the C compiler may be generating 64-bit (= s390x) code
-         # or 31-bit (= s390) code.
-         AC_COMPILE_IFELSE(
-           [AC_LANG_SOURCE(
-              [[#if defined __LP64__ || defined __s390x__
-                  int ok;
-                #else
-                  error fail
-                #endif
-              ]])],
-           [gl_cv_host_cpu_c_abi=s390x],
-           [gl_cv_host_cpu_c_abi=s390])
-         ;;
-
-       sparc | sparc64 )
-         # UltraSPARCs running Linux have `uname -m` = "sparc64", but the
-         # C compiler still generates 32-bit code.
-         AC_COMPILE_IFELSE(
-           [AC_LANG_SOURCE(
-              [[#if defined __sparcv9 || defined __arch64__
-                 int ok;
-                #else
-                 error fail
-                #endif
-              ]])],
-           [gl_cv_host_cpu_c_abi=sparc64],
-           [gl_cv_host_cpu_c_abi=sparc])
-         ;;
-
-       *)
-         gl_cv_host_cpu_c_abi="$host_cpu"
-         ;;
-     esac
-    ])
-
-  dnl In most cases, $HOST_CPU and $HOST_CPU_C_ABI are the same.
-  HOST_CPU=`echo "$gl_cv_host_cpu_c_abi" | sed -e 's/-.*//'`
-  HOST_CPU_C_ABI="$gl_cv_host_cpu_c_abi"
-  AC_SUBST([HOST_CPU])
-  AC_SUBST([HOST_CPU_C_ABI])
-
-  # This was
-  #   AC_DEFINE_UNQUOTED([__${HOST_CPU}__])
-  #   AC_DEFINE_UNQUOTED([__${HOST_CPU_C_ABI}__])
-  # earlier, but KAI C++ 3.2d doesn't like this.
-  sed -e 's/-/_/g' >> confdefs.h <<EOF
-#ifndef __${HOST_CPU}__
-#define __${HOST_CPU}__ 1
-#endif
-#ifndef __${HOST_CPU_C_ABI}__
-#define __${HOST_CPU_C_ABI}__ 1
-#endif
-EOF
-  AH_TOP([/* CPU and C ABI indicator */
-#ifndef __i386__
-#undef __i386__
-#endif
-#ifndef __x86_64_x32__
-#undef __x86_64_x32__
-#endif
-#ifndef __x86_64__
-#undef __x86_64__
-#endif
-#ifndef __alpha__
-#undef __alpha__
-#endif
-#ifndef __arm__
-#undef __arm__
-#endif
-#ifndef __armhf__
-#undef __armhf__
-#endif
-#ifndef __arm64_ilp32__
-#undef __arm64_ilp32__
-#endif
-#ifndef __arm64__
-#undef __arm64__
-#endif
-#ifndef __hppa__
-#undef __hppa__
-#endif
-#ifndef __hppa64__
-#undef __hppa64__
-#endif
-#ifndef __ia64_ilp32__
-#undef __ia64_ilp32__
-#endif
-#ifndef __ia64__
-#undef __ia64__
-#endif
-#ifndef __m68k__
-#undef __m68k__
-#endif
-#ifndef __mips__
-#undef __mips__
-#endif
-#ifndef __mipsn32__
-#undef __mipsn32__
-#endif
-#ifndef __mips64__
-#undef __mips64__
-#endif
-#ifndef __powerpc__
-#undef __powerpc__
-#endif
-#ifndef __powerpc64__
-#undef __powerpc64__
-#endif
-#ifndef __powerpc64_elfv2__
-#undef __powerpc64_elfv2__
-#endif
-#ifndef __riscv32__
-#undef __riscv32__
-#endif
-#ifndef __riscv64__
-#undef __riscv64__
-#endif
-#ifndef __riscv32_ilp32__
-#undef __riscv32_ilp32__
-#endif
-#ifndef __riscv32_ilp32f__
-#undef __riscv32_ilp32f__
-#endif
-#ifndef __riscv32_ilp32d__
-#undef __riscv32_ilp32d__
-#endif
-#ifndef __riscv64_ilp32__
-#undef __riscv64_ilp32__
-#endif
-#ifndef __riscv64_ilp32f__
-#undef __riscv64_ilp32f__
-#endif
-#ifndef __riscv64_ilp32d__
-#undef __riscv64_ilp32d__
-#endif
-#ifndef __riscv64_lp64__
-#undef __riscv64_lp64__
-#endif
-#ifndef __riscv64_lp64f__
-#undef __riscv64_lp64f__
-#endif
-#ifndef __riscv64_lp64d__
-#undef __riscv64_lp64d__
-#endif
-#ifndef __s390__
-#undef __s390__
-#endif
-#ifndef __s390x__
-#undef __s390x__
-#endif
-#ifndef __sh__
-#undef __sh__
-#endif
-#ifndef __sparc__
-#undef __sparc__
-#endif
-#ifndef __sparc64__
-#undef __sparc64__
-#endif
-])
-
-])
-
-
-dnl Sets the HOST_CPU_C_ABI_32BIT variable to 'yes' if the C language ABI
-dnl (application binary interface) is a 32-bit one, to 'no' if it is a 64-bit
-dnl one, or to 'unknown' if unknown.
-dnl This is a simplified variant of gl_HOST_CPU_C_ABI.
-AC_DEFUN([gl_HOST_CPU_C_ABI_32BIT],
-[
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_CACHE_CHECK([32-bit host C ABI], [gl_cv_host_cpu_c_abi_32bit],
-    [if test -n "$gl_cv_host_cpu_c_abi"; then
-       case "$gl_cv_host_cpu_c_abi" in
-         i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
-           gl_cv_host_cpu_c_abi_32bit=yes ;;
-         x86_64 | alpha | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 )
-           gl_cv_host_cpu_c_abi_32bit=no ;;
-         *)
-           gl_cv_host_cpu_c_abi_32bit=unknown ;;
-       esac
-     else
-       case "$host_cpu" in
-
-         # CPUs that only support a 32-bit ABI.
-         arc \
-         | bfin \
-         | cris* \
-         | csky \
-         | epiphany \
-         | ft32 \
-         | h8300 \
-         | m68k \
-         | microblaze | microblazeel \
-         | nds32 | nds32le | nds32be \
-         | nios2 | nios2eb | nios2el \
-         | or1k* \
-         | or32 \
-         | sh | sh[1234] | sh[1234]e[lb] \
-         | tic6x \
-         | xtensa* )
-           gl_cv_host_cpu_c_abi_32bit=yes
-           ;;
-
-         # CPUs that only support a 64-bit ABI.
-changequote(,)dnl
-         alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \
-         | mmix )
-changequote([,])dnl
-           gl_cv_host_cpu_c_abi_32bit=no
-           ;;
-
-changequote(,)dnl
-         i[34567]86 )
-changequote([,])dnl
-           gl_cv_host_cpu_c_abi_32bit=yes
-           ;;
-
-         x86_64 )
-           # On x86_64 systems, the C compiler may be generating code in one of
-           # these ABIs:
-           # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64.
-           # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64
-           #   with native Windows (mingw, MSVC).
-           # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32.
-           # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386.
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE(
-                [[#if (defined __x86_64__ || defined __amd64__ \
-                       || defined _M_X64 || defined _M_AMD64) \
-                      && !(defined __ILP32__ || defined _ILP32)
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                ]])],
-             [gl_cv_host_cpu_c_abi_32bit=no],
-             [gl_cv_host_cpu_c_abi_32bit=yes])
-           ;;
-
-         arm* | aarch64 )
-           # Assume arm with EABI.
-           # On arm64 systems, the C compiler may be generating code in one of
-           # these ABIs:
-           # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64.
-           # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32.
-           # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf.
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE(
-                [[#if defined __aarch64__ && !(defined __ILP32__ || defined _ILP32)
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                ]])],
-             [gl_cv_host_cpu_c_abi_32bit=no],
-             [gl_cv_host_cpu_c_abi_32bit=yes])
-           ;;
-
-         hppa1.0 | hppa1.1 | hppa2.0* | hppa64 )
-           # On hppa, the C compiler may be generating 32-bit code or 64-bit
-           # code. In the latter case, it defines _LP64 and __LP64__.
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE(
-                [[#ifdef __LP64__
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                ]])],
-             [gl_cv_host_cpu_c_abi_32bit=no],
-             [gl_cv_host_cpu_c_abi_32bit=yes])
-           ;;
-
-         ia64* )
-           # On ia64 on HP-UX, the C compiler may be generating 64-bit code or
-           # 32-bit code. In the latter case, it defines _ILP32.
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE(
-                [[#ifdef _ILP32
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                ]])],
-             [gl_cv_host_cpu_c_abi_32bit=yes],
-             [gl_cv_host_cpu_c_abi_32bit=no])
-           ;;
-
-         mips* )
-           # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this
-           # at 32.
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE(
-                [[#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64)
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                ]])],
-             [gl_cv_host_cpu_c_abi_32bit=no],
-             [gl_cv_host_cpu_c_abi_32bit=yes])
-           ;;
-
-         powerpc* )
-           # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD.
-           # No need to distinguish them here; the caller may distinguish
-           # them based on the OS.
-           # On powerpc64 systems, the C compiler may still be generating
-           # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may
-           # be generating 64-bit code.
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE(
-                [[#if defined __powerpc64__ || defined _ARCH_PPC64
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                ]])],
-             [gl_cv_host_cpu_c_abi_32bit=no],
-             [gl_cv_host_cpu_c_abi_32bit=yes])
-           ;;
-
-         rs6000 )
-           gl_cv_host_cpu_c_abi_32bit=yes
-           ;;
-
-         riscv32 | riscv64 )
-           # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d.
-           # Size of 'long' and 'void *':
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE(
-                [[#if defined __LP64__
-                    int ok;
-                  #else
-                    error fail
-                  #endif
-                ]])],
-             [gl_cv_host_cpu_c_abi_32bit=no],
-             [gl_cv_host_cpu_c_abi_32bit=yes])
-           ;;
-
-         s390* )
-           # On s390x, the C compiler may be generating 64-bit (= s390x) code
-           # or 31-bit (= s390) code.
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE(
-                [[#if defined __LP64__ || defined __s390x__
-                    int ok;
-                  #else
-                    error fail
-                  #endif
-                ]])],
-             [gl_cv_host_cpu_c_abi_32bit=no],
-             [gl_cv_host_cpu_c_abi_32bit=yes])
-           ;;
-
-         sparc | sparc64 )
-           # UltraSPARCs running Linux have `uname -m` = "sparc64", but the
-           # C compiler still generates 32-bit code.
-           AC_COMPILE_IFELSE(
-             [AC_LANG_SOURCE(
-                [[#if defined __sparcv9 || defined __arch64__
-                   int ok;
-                  #else
-                   error fail
-                  #endif
-                ]])],
-             [gl_cv_host_cpu_c_abi_32bit=no],
-             [gl_cv_host_cpu_c_abi_32bit=yes])
-           ;;
-
-         *)
-           gl_cv_host_cpu_c_abi_32bit=unknown
-           ;;
-       esac
-     fi
-    ])
-
-  HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit"
-])
diff --git a/m4/iconv.m4 b/m4/iconv.m4
@@ -1,288 +0,0 @@
-# iconv.m4 serial 21
-dnl Copyright (C) 2000-2002, 2007-2014, 2016-2020 Free Software Foundation,
-dnl Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
-[
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([iconv])
-])
-
-AC_DEFUN([AM_ICONV_LINK],
-[
-  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  dnl those with the standalone portable GNU libiconv installed).
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-
-  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed libiconv and not disabled its use
-  dnl via --without-libiconv-prefix, he wants to use it. The first
-  dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
-  am_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
-
-  AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
-    am_cv_func_iconv="no, consider installing GNU libiconv"
-    am_cv_lib_iconv=no
-    AC_LINK_IFELSE(
-      [AC_LANG_PROGRAM(
-         [[
-#include <stdlib.h>
-#include <iconv.h>
-         ]],
-         [[iconv_t cd = iconv_open("","");
-           iconv(cd,NULL,NULL,NULL,NULL);
-           iconv_close(cd);]])],
-      [am_cv_func_iconv=yes])
-    if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
-      LIBS="$LIBS $LIBICONV"
-      AC_LINK_IFELSE(
-        [AC_LANG_PROGRAM(
-           [[
-#include <stdlib.h>
-#include <iconv.h>
-           ]],
-           [[iconv_t cd = iconv_open("","");
-             iconv(cd,NULL,NULL,NULL,NULL);
-             iconv_close(cd);]])],
-        [am_cv_lib_iconv=yes]
-        [am_cv_func_iconv=yes])
-      LIBS="$am_save_LIBS"
-    fi
-  ])
-  if test "$am_cv_func_iconv" = yes; then
-    AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
-      dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
-      dnl Solaris 10.
-      am_save_LIBS="$LIBS"
-      if test $am_cv_lib_iconv = yes; then
-        LIBS="$LIBS $LIBICONV"
-      fi
-      am_cv_func_iconv_works=no
-      for ac_iconv_const in '' 'const'; do
-        AC_RUN_IFELSE(
-          [AC_LANG_PROGRAM(
-             [[
-#include <iconv.h>
-#include <string.h>
-
-#ifndef ICONV_CONST
-# define ICONV_CONST $ac_iconv_const
-#endif
-             ]],
-             [[int result = 0;
-  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
-     returns.  */
-  {
-    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
-    if (cd_utf8_to_88591 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
-        char buf[10];
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_utf8_to_88591,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          result |= 1;
-        iconv_close (cd_utf8_to_88591);
-      }
-  }
-  /* Test against Solaris 10 bug: Failures are not distinguishable from
-     successful returns.  */
-  {
-    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
-    if (cd_ascii_to_88591 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\263";
-        char buf[10];
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_ascii_to_88591,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          result |= 2;
-        iconv_close (cd_ascii_to_88591);
-      }
-  }
-  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
-  {
-    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
-    if (cd_88591_to_utf8 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\304";
-        static char buf[2] = { (char)0xDE, (char)0xAD };
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = 1;
-        char *outptr = buf;
-        size_t outbytesleft = 1;
-        size_t res = iconv (cd_88591_to_utf8,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
-          result |= 4;
-        iconv_close (cd_88591_to_utf8);
-      }
-  }
-#if 0 /* This bug could be worked around by the caller.  */
-  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
-  {
-    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
-    if (cd_88591_to_utf8 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
-        char buf[50];
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_88591_to_utf8,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if ((int)res > 0)
-          result |= 8;
-        iconv_close (cd_88591_to_utf8);
-      }
-  }
-#endif
-  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
-     provided.  */
-  {
-    /* Try standardized names.  */
-    iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP");
-    /* Try IRIX, OSF/1 names.  */
-    iconv_t cd2 = iconv_open ("UTF-8", "eucJP");
-    /* Try AIX names.  */
-    iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP");
-    /* Try HP-UX names.  */
-    iconv_t cd4 = iconv_open ("utf8", "eucJP");
-    if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
-        && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
-      result |= 16;
-    if (cd1 != (iconv_t)(-1))
-      iconv_close (cd1);
-    if (cd2 != (iconv_t)(-1))
-      iconv_close (cd2);
-    if (cd3 != (iconv_t)(-1))
-      iconv_close (cd3);
-    if (cd4 != (iconv_t)(-1))
-      iconv_close (cd4);
-  }
-  return result;
-]])],
-          [am_cv_func_iconv_works=yes], ,
-          [case "$host_os" in
-             aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
-             *)            am_cv_func_iconv_works="guessing yes" ;;
-           esac])
-        test "$am_cv_func_iconv_works" = no || break
-      done
-      LIBS="$am_save_LIBS"
-    ])
-    case "$am_cv_func_iconv_works" in
-      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
-      *)   am_func_iconv=yes ;;
-    esac
-  else
-    am_func_iconv=no am_cv_lib_iconv=no
-  fi
-  if test "$am_func_iconv" = yes; then
-    AC_DEFINE([HAVE_ICONV], [1],
-      [Define if you have the iconv() function and it works.])
-  fi
-  if test "$am_cv_lib_iconv" = yes; then
-    AC_MSG_CHECKING([how to link with libiconv])
-    AC_MSG_RESULT([$LIBICONV])
-  else
-    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
-    dnl either.
-    CPPFLAGS="$am_save_CPPFLAGS"
-    LIBICONV=
-    LTLIBICONV=
-  fi
-  AC_SUBST([LIBICONV])
-  AC_SUBST([LTLIBICONV])
-])
-
-dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
-dnl avoid warnings like
-dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
-dnl This is tricky because of the way 'aclocal' is implemented:
-dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
-dnl   Otherwise aclocal's initial scan pass would miss the macro definition.
-dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
-dnl   Otherwise aclocal would emit many "Use of uninitialized value $1"
-dnl   warnings.
-m4_define([gl_iconv_AC_DEFUN],
-  m4_version_prereq([2.64],
-    [[AC_DEFUN_ONCE(
-        [$1], [$2])]],
-    [m4_ifdef([gl_00GNULIB],
-       [[AC_DEFUN_ONCE(
-           [$1], [$2])]],
-       [[AC_DEFUN(
-           [$1], [$2])]])]))
-gl_iconv_AC_DEFUN([AM_ICONV],
-[
-  AM_ICONV_LINK
-  if test "$am_cv_func_iconv" = yes; then
-    AC_MSG_CHECKING([for iconv declaration])
-    AC_CACHE_VAL([am_cv_proto_iconv], [
-      AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM(
-           [[
-#include <stdlib.h>
-#include <iconv.h>
-extern
-#ifdef __cplusplus
-"C"
-#endif
-#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-#else
-size_t iconv();
-#endif
-           ]],
-           [[]])],
-        [am_cv_proto_iconv_arg1=""],
-        [am_cv_proto_iconv_arg1="const"])
-      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
-    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    AC_MSG_RESULT([
-         $am_cv_proto_iconv])
-  else
-    dnl When compiling GNU libiconv on a system that does not have iconv yet,
-    dnl pick the POSIX compliant declaration without 'const'.
-    am_cv_proto_iconv_arg1=""
-  fi
-  AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
-    [Define as const if the declaration of iconv() needs const.])
-  dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
-  m4_ifdef([gl_ICONV_H_DEFAULTS],
-    [AC_REQUIRE([gl_ICONV_H_DEFAULTS])
-     if test -n "$am_cv_proto_iconv_arg1"; then
-       ICONV_CONST="const"
-     fi
-    ])
-])
diff --git a/m4/intdiv0.m4 b/m4/intdiv0.m4
@@ -1,87 +0,0 @@
-# intdiv0.m4 serial 6 (gettext-0.18.2)
-dnl Copyright (C) 2002, 2007-2008, 2010-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([gt_INTDIV0],
-[
-  AC_REQUIRE([AC_PROG_CC])dnl
-  AC_REQUIRE([AC_CANONICAL_HOST])dnl
-
-  AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
-    gt_cv_int_divbyzero_sigfpe,
-    [
-      gt_cv_int_divbyzero_sigfpe=
-changequote(,)dnl
-      case "$host_os" in
-        macos* | darwin[6-9]* | darwin[1-9][0-9]*)
-          # On Mac OS X 10.2 or newer, just assume the same as when cross-
-          # compiling. If we were to perform the real test, 1 Crash Report
-          # dialog window would pop up.
-          case "$host_cpu" in
-            i[34567]86 | x86_64)
-              gt_cv_int_divbyzero_sigfpe="guessing yes" ;;
-          esac
-          ;;
-      esac
-changequote([,])dnl
-      if test -z "$gt_cv_int_divbyzero_sigfpe"; then
-        AC_RUN_IFELSE(
-          [AC_LANG_SOURCE([[
-#include <stdlib.h>
-#include <signal.h>
-
-static void
-sigfpe_handler (int sig)
-{
-  /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
-  exit (sig != SIGFPE);
-}
-
-int x = 1;
-int y = 0;
-int z;
-int nan;
-
-int main ()
-{
-  signal (SIGFPE, sigfpe_handler);
-/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP.  */
-#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
-  signal (SIGTRAP, sigfpe_handler);
-#endif
-/* Linux/SPARC yields signal SIGILL.  */
-#if defined (__sparc__) && defined (__linux__)
-  signal (SIGILL, sigfpe_handler);
-#endif
-
-  z = x / y;
-  nan = y / y;
-  exit (2);
-}
-]])],
-          [gt_cv_int_divbyzero_sigfpe=yes],
-          [gt_cv_int_divbyzero_sigfpe=no],
-          [
-            # Guess based on the CPU.
-changequote(,)dnl
-            case "$host_cpu" in
-              alpha* | i[34567]86 | x86_64 | m68k | s390*)
-                gt_cv_int_divbyzero_sigfpe="guessing yes";;
-              *)
-                gt_cv_int_divbyzero_sigfpe="guessing no";;
-            esac
-changequote([,])dnl
-          ])
-      fi
-    ])
-  case "$gt_cv_int_divbyzero_sigfpe" in
-    *yes) value=1;;
-    *) value=0;;
-  esac
-  AC_DEFINE_UNQUOTED([INTDIV0_RAISES_SIGFPE], [$value],
-    [Define if integer division by zero raises signal SIGFPE.])
-])
diff --git a/m4/intl.m4 b/m4/intl.m4
@@ -1,298 +0,0 @@
-# intl.m4 serial 27 (gettext-0.19)
-dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2009.
-
-AC_PREREQ([2.60])
-
-dnl Checks for all prerequisites of the intl subdirectory,
-dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
-dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
-AC_DEFUN([AM_INTL_SUBDIR],
-[
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-  AC_REQUIRE([AC_PROG_CC])dnl
-  AC_REQUIRE([AC_CANONICAL_HOST])dnl
-  AC_REQUIRE([gt_GLIBC2])dnl
-  AC_REQUIRE([AC_PROG_RANLIB])dnl
-  AC_REQUIRE([gl_VISIBILITY])dnl
-  AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl
-  AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl
-  AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
-  AC_REQUIRE([gt_TYPE_WINT_T])dnl
-  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([gt_TYPE_INTMAX_T])
-  AC_REQUIRE([gt_PRINTF_POSIX])
-  AC_REQUIRE([gl_GLIBC21])dnl
-  AC_REQUIRE([gl_XSIZE])dnl
-  AC_REQUIRE([gl_FCNTL_O_FLAGS])dnl
-  AC_REQUIRE([gt_INTL_MACOSX])dnl
-  AC_REQUIRE([gl_EXTERN_INLINE])dnl
-  AC_REQUIRE([gt_GL_ATTRIBUTE])dnl
-
-  dnl Support for automake's --enable-silent-rules.
-  case "$enable_silent_rules" in
-    yes) INTL_DEFAULT_VERBOSITY=0;;
-    no)  INTL_DEFAULT_VERBOSITY=1;;
-    *)   INTL_DEFAULT_VERBOSITY=1;;
-  esac
-  AC_SUBST([INTL_DEFAULT_VERBOSITY])
-
-  AC_CHECK_TYPE([ptrdiff_t], ,
-    [AC_DEFINE([ptrdiff_t], [long],
-       [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
-    ])
-  AC_CHECK_HEADERS([features.h stddef.h stdlib.h string.h])
-  AC_CHECK_FUNCS([asprintf fwprintf newlocale putenv setenv setlocale \
-    snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb])
-
-  dnl Use the _snprintf function only if it is declared (because on NetBSD it
-  dnl is defined as a weak alias of snprintf; we prefer to use the latter).
-  AC_CHECK_DECLS([_snprintf, _snwprintf], , , [#include <stdio.h>])
-
-  dnl Use the *_unlocked functions only if they are declared.
-  dnl (because some of them were defined without being declared in Solaris
-  dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
-  dnl on Solaris 2.5.1 to run on Solaris 2.6).
-  AC_CHECK_DECLS([getc_unlocked], , , [#include <stdio.h>])
-
-  case $gt_cv_func_printf_posix in
-    *yes) HAVE_POSIX_PRINTF=1 ;;
-    *) HAVE_POSIX_PRINTF=0 ;;
-  esac
-  AC_SUBST([HAVE_POSIX_PRINTF])
-  if test "$ac_cv_func_asprintf" = yes; then
-    HAVE_ASPRINTF=1
-  else
-    HAVE_ASPRINTF=0
-  fi
-  AC_SUBST([HAVE_ASPRINTF])
-  if test "$ac_cv_func_snprintf" = yes; then
-    HAVE_SNPRINTF=1
-  else
-    HAVE_SNPRINTF=0
-  fi
-  AC_SUBST([HAVE_SNPRINTF])
-  if test "$ac_cv_func_newlocale" = yes; then
-    HAVE_NEWLOCALE=1
-  else
-    HAVE_NEWLOCALE=0
-  fi
-  AC_SUBST([HAVE_NEWLOCALE])
-  if test "$ac_cv_func_wprintf" = yes; then
-    HAVE_WPRINTF=1
-  else
-    HAVE_WPRINTF=0
-  fi
-  AC_SUBST([HAVE_WPRINTF])
-
-  AM_LANGINFO_CODESET
-  gt_LC_MESSAGES
-
-  dnl Compilation on mingw and Cygwin needs special Makefile rules, because
-  dnl 1. when we install a shared library, we must arrange to export
-  dnl    auxiliary pointer variables for every exported variable,
-  dnl 2. when we install a shared library and a static library simultaneously,
-  dnl    the include file specifies __declspec(dllimport) and therefore we
-  dnl    must arrange to define the auxiliary pointer variables for the
-  dnl    exported variables _also_ in the static library.
-  if test "$enable_shared" = yes; then
-    case "$host_os" in
-      mingw* | cygwin*) is_woe32dll=yes ;;
-      *) is_woe32dll=no ;;
-    esac
-  else
-    is_woe32dll=no
-  fi
-  WOE32DLL=$is_woe32dll
-  AC_SUBST([WOE32DLL])
-
-  dnl On mingw and Cygwin, we can activate special Makefile rules which add
-  dnl version information to the shared libraries and executables.
-  case "$host_os" in
-    mingw* | cygwin*) is_woe32=yes ;;
-    *) is_woe32=no ;;
-  esac
-  WOE32=$is_woe32
-  AC_SUBST([WOE32])
-  if test $WOE32 = yes; then
-    dnl Check for a program that compiles Windows resource files.
-    AC_CHECK_TOOL([WINDRES], [windres])
-  fi
-
-  dnl Determine whether when creating a library, "-lc" should be passed to
-  dnl libtool or not. On many platforms, it is required for the libtool option
-  dnl -no-undefined to work. On HP-UX, however, the -lc - stored by libtool
-  dnl in the *.la files - makes it impossible to create multithreaded programs,
-  dnl because libtool also reorders the -lc to come before the -pthread, and
-  dnl this disables pthread_create() <http://docs.hp.com/en/1896/pthreads.html>.
-  case "$host_os" in
-    hpux*) LTLIBC="" ;;
-    *)     LTLIBC="-lc" ;;
-  esac
-  AC_SUBST([LTLIBC])
-
-  dnl Rename some macros and functions used for locking.
-  AH_BOTTOM([
-#define __libc_lock_t                   gl_lock_t
-#define __libc_lock_define              gl_lock_define
-#define __libc_lock_define_initialized  gl_lock_define_initialized
-#define __libc_lock_init                gl_lock_init
-#define __libc_lock_lock                gl_lock_lock
-#define __libc_lock_unlock              gl_lock_unlock
-#define __libc_lock_recursive_t                   gl_recursive_lock_t
-#define __libc_lock_define_recursive              gl_recursive_lock_define
-#define __libc_lock_define_initialized_recursive  gl_recursive_lock_define_initialized
-#define __libc_lock_init_recursive                gl_recursive_lock_init
-#define __libc_lock_lock_recursive                gl_recursive_lock_lock
-#define __libc_lock_unlock_recursive              gl_recursive_lock_unlock
-#define glthread_in_use  libintl_thread_in_use
-#define glthread_lock_init_func     libintl_lock_init_func
-#define glthread_lock_lock_func     libintl_lock_lock_func
-#define glthread_lock_unlock_func   libintl_lock_unlock_func
-#define glthread_lock_destroy_func  libintl_lock_destroy_func
-#define glthread_rwlock_init_multithreaded     libintl_rwlock_init_multithreaded
-#define glthread_rwlock_init_func              libintl_rwlock_init_func
-#define glthread_rwlock_rdlock_multithreaded   libintl_rwlock_rdlock_multithreaded
-#define glthread_rwlock_rdlock_func            libintl_rwlock_rdlock_func
-#define glthread_rwlock_wrlock_multithreaded   libintl_rwlock_wrlock_multithreaded
-#define glthread_rwlock_wrlock_func            libintl_rwlock_wrlock_func
-#define glthread_rwlock_unlock_multithreaded   libintl_rwlock_unlock_multithreaded
-#define glthread_rwlock_unlock_func            libintl_rwlock_unlock_func
-#define glthread_rwlock_destroy_multithreaded  libintl_rwlock_destroy_multithreaded
-#define glthread_rwlock_destroy_func           libintl_rwlock_destroy_func
-#define glthread_recursive_lock_init_multithreaded     libintl_recursive_lock_init_multithreaded
-#define glthread_recursive_lock_init_func              libintl_recursive_lock_init_func
-#define glthread_recursive_lock_lock_multithreaded     libintl_recursive_lock_lock_multithreaded
-#define glthread_recursive_lock_lock_func              libintl_recursive_lock_lock_func
-#define glthread_recursive_lock_unlock_multithreaded   libintl_recursive_lock_unlock_multithreaded
-#define glthread_recursive_lock_unlock_func            libintl_recursive_lock_unlock_func
-#define glthread_recursive_lock_destroy_multithreaded  libintl_recursive_lock_destroy_multithreaded
-#define glthread_recursive_lock_destroy_func           libintl_recursive_lock_destroy_func
-#define glthread_once_func            libintl_once_func
-#define glthread_once_singlethreaded  libintl_once_singlethreaded
-#define glthread_once_multithreaded   libintl_once_multithreaded
-])
-])
-
-
-dnl Checks for the core files of the intl subdirectory:
-dnl   dcigettext.c
-dnl   eval-plural.h
-dnl   explodename.c
-dnl   finddomain.c
-dnl   gettextP.h
-dnl   gmo.h
-dnl   hash-string.h hash-string.c
-dnl   l10nflist.c
-dnl   libgnuintl.h.in (except the *printf stuff)
-dnl   loadinfo.h
-dnl   loadmsgcat.c
-dnl   localealias.c
-dnl   log.c
-dnl   plural-exp.h plural-exp.c
-dnl   plural.y
-dnl Used by libglocale.
-AC_DEFUN([gt_INTL_SUBDIR_CORE],
-[
-  AC_REQUIRE([AC_C_INLINE])dnl
-  AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
-  AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-  AC_REQUIRE([AC_FUNC_MMAP])dnl
-  AC_REQUIRE([gt_INTDIV0])dnl
-  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
-  AC_REQUIRE([gt_INTTYPES_PRI])dnl
-  AC_REQUIRE([gl_LOCK])dnl
-
-  AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM(
-       [[int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }]],
-       [[]])],
-    [AC_DEFINE([HAVE_BUILTIN_EXPECT], [1],
-       [Define to 1 if the compiler understands __builtin_expect.])])
-
-  AC_CHECK_HEADERS([argz.h inttypes.h limits.h unistd.h sys/param.h])
-  AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \
-    stpcpy strcasecmp strdup strtoul tsearch uselocale argz_count \
-    argz_stringify argz_next __fsetlocking])
-
-  dnl Use the *_unlocked functions only if they are declared.
-  dnl (because some of them were defined without being declared in Solaris
-  dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
-  dnl on Solaris 2.5.1 to run on Solaris 2.6).
-  AC_CHECK_DECLS([feof_unlocked, fgets_unlocked], , , [#include <stdio.h>])
-
-  AM_ICONV
-
-  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
-  dnl because plural.y uses bison specific features. It requires at least
-  dnl bison-2.7 for %define api.pure.
-  dnl bison is only needed for the maintainer (who touches plural.y). But in
-  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
-  dnl the rule in general Makefile. Now, some people carelessly touch the
-  dnl files or have a broken "make" program, hence the plural.c rule will
-  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
-  dnl present or too old.
-  AC_CHECK_PROGS([INTLBISON], [bison])
-  if test -z "$INTLBISON"; then
-    ac_verc_fail=yes
-  else
-    dnl Found it, now check the version.
-    AC_MSG_CHECKING([version of bison])
-changequote(<<,>>)dnl
-    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-    case $ac_prog_version in
-      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-      2.[7-9]* | [3-9].*)
-changequote([,])dnl
-         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-    esac
-    AC_MSG_RESULT([$ac_prog_version])
-  fi
-  if test $ac_verc_fail = yes; then
-    INTLBISON=:
-  fi
-])
-
-dnl Copies _GL_UNUSED and _GL_ATTRIBUTE_PURE definitions from
-dnl gnulib-common.m4 as a fallback, if the project isn't using Gnulib.
-AC_DEFUN([gt_GL_ATTRIBUTE], [
-  m4_ifndef([gl_[]COMMON],
-    AH_VERBATIM([gt_gl_attribute],
-[/* Define as a marker that can be attached to declarations that might not
-    be used.  This helps to reduce warnings, such as from
-    GCC -Wunused-parameter.  */
-#ifndef _GL_UNUSED
-# if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-#  define _GL_UNUSED __attribute__ ((__unused__))
-# else
-#  define _GL_UNUSED
-# endif
-#endif
-
-/* The __pure__ attribute was added in gcc 2.96.  */
-#ifndef _GL_ATTRIBUTE_PURE
-# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-#  define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-# else
-#  define _GL_ATTRIBUTE_PURE /* empty */
-# endif
-#endif
-]))])
diff --git a/m4/intldir.m4 b/m4/intldir.m4
@@ -1,19 +0,0 @@
-# intldir.m4 serial 2 (gettext-0.18)
-dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-AC_PREREQ([2.52])
-
-dnl Tells the AM_GNU_GETTEXT macro to consider an intl/ directory.
-AC_DEFUN([AM_GNU_GETTEXT_INTL_SUBDIR], [])
diff --git a/m4/intlmacosx.m4 b/m4/intlmacosx.m4
@@ -1,65 +0,0 @@
-# intlmacosx.m4 serial 8 (gettext-0.20.2)
-dnl Copyright (C) 2004-2014, 2016, 2019-2020 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Lesser General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Lesser General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Checks for special options needed on Mac OS X.
-dnl Defines INTL_MACOSX_LIBS.
-AC_DEFUN([gt_INTL_MACOSX],
-[
-  dnl Check for API introduced in Mac OS X 10.4.
-  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
-    [gt_cv_func_CFPreferencesCopyAppValue],
-    [gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_LINK_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <CoreFoundation/CFPreferences.h>]],
-          [[CFPreferencesCopyAppValue(NULL, NULL)]])],
-       [gt_cv_func_CFPreferencesCopyAppValue=yes],
-       [gt_cv_func_CFPreferencesCopyAppValue=no])
-     LIBS="$gt_save_LIBS"])
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
-      [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
-  fi
-  dnl Don't check for the API introduced in Mac OS X 10.5, CFLocaleCopyCurrent,
-  dnl because in macOS 10.13.4 it has the following behaviour:
-  dnl When two or more languages are specified in the
-  dnl "System Preferences > Language & Region > Preferred Languages" panel,
-  dnl it returns en_CC where CC is the territory (even when English is not among
-  dnl the preferred languages!).  What we want instead is what
-  dnl CFLocaleCopyCurrent returned in earlier macOS releases and what
-  dnl CFPreferencesCopyAppValue still returns, namely ll_CC where ll is the
-  dnl first among the preferred languages and CC is the territory.
-  AC_CACHE_CHECK([for CFLocaleCopyPreferredLanguages], [gt_cv_func_CFLocaleCopyPreferredLanguages],
-    [gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_LINK_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <CoreFoundation/CFLocale.h>]],
-          [[CFLocaleCopyPreferredLanguages();]])],
-       [gt_cv_func_CFLocaleCopyPreferredLanguages=yes],
-       [gt_cv_func_CFLocaleCopyPreferredLanguages=no])
-     LIBS="$gt_save_LIBS"])
-  if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
-    AC_DEFINE([HAVE_CFLOCALECOPYPREFERREDLANGUAGES], [1],
-      [Define to 1 if you have the Mac OS X function CFLocaleCopyPreferredLanguages in the CoreFoundation framework.])
-  fi
-  INTL_MACOSX_LIBS=
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes \
-     || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
-    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
-  fi
-  AC_SUBST([INTL_MACOSX_LIBS])
-])
diff --git a/m4/intmax.m4 b/m4/intmax.m4
@@ -1,36 +0,0 @@
-# intmax.m4 serial 6 (gettext-0.18.2)
-dnl Copyright (C) 2002-2005, 2008-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-dnl Test whether the system has the 'intmax_t' type, but don't attempt to
-dnl find a replacement if it is lacking.
-
-AC_DEFUN([gt_TYPE_INTMAX_T],
-[
-  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
-  AC_CACHE_CHECK([for intmax_t], [gt_cv_c_intmax_t],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[
-#include <stddef.h>
-#include <stdlib.h>
-#if HAVE_STDINT_H_WITH_UINTMAX
-#include <stdint.h>
-#endif
-#if HAVE_INTTYPES_H_WITH_UINTMAX
-#include <inttypes.h>
-#endif
-          ]],
-          [[intmax_t x = -1;
-            return !x;]])],
-       [gt_cv_c_intmax_t=yes],
-       [gt_cv_c_intmax_t=no])])
-  if test $gt_cv_c_intmax_t = yes; then
-    AC_DEFINE([HAVE_INTMAX_T], [1],
-      [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
-  fi
-])
diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4
@@ -1,42 +0,0 @@
-# inttypes-pri.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1997-2002, 2006, 2008-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_PREREQ([2.53])
-
-# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
-# macros to non-string values.  This is the case on AIX 4.3.3.
-
-AC_DEFUN([gt_INTTYPES_PRI],
-[
-  AC_CHECK_HEADERS([inttypes.h])
-  if test $ac_cv_header_inttypes_h = yes; then
-    AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
-      [gt_cv_inttypes_pri_broken],
-      [
-        AC_COMPILE_IFELSE(
-          [AC_LANG_PROGRAM(
-             [[
-#include <inttypes.h>
-#ifdef PRId32
-char *p = PRId32;
-#endif
-             ]],
-             [[]])],
-          [gt_cv_inttypes_pri_broken=no],
-          [gt_cv_inttypes_pri_broken=yes])
-      ])
-  fi
-  if test "$gt_cv_inttypes_pri_broken" = yes; then
-    AC_DEFINE_UNQUOTED([PRI_MACROS_BROKEN], [1],
-      [Define if <inttypes.h> exists and defines unusable PRI* macros.])
-    PRI_MACROS_BROKEN=1
-  else
-    PRI_MACROS_BROKEN=0
-  fi
-  AC_SUBST([PRI_MACROS_BROKEN])
-])
diff --git a/m4/inttypes.m4 b/m4/inttypes.m4
@@ -1,27 +0,0 @@
-# inttypes.m4 serial 1 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
-# <sys/types.h>.
-
-AC_DEFUN([gt_HEADER_INTTYPES_H],
-[
-  AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
-  [
-    AC_TRY_COMPILE(
-      [#include <sys/types.h>
-#include <inttypes.h>],
-      [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
-  ])
-  if test $gt_cv_header_inttypes_h = yes; then
-    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
-      [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
-  fi
-])
diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4
@@ -1,29 +0,0 @@
-# inttypes_h.m4 serial 10
-dnl Copyright (C) 1997-2004, 2006, 2008-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Paul Eggert.
-
-# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
-# doesn't clash with <sys/types.h>, and declares uintmax_t.
-
-AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
-[
-  AC_CACHE_CHECK([for inttypes.h], [gl_cv_header_inttypes_h],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[
-#include <sys/types.h>
-#include <inttypes.h>
-          ]],
-          [[uintmax_t i = (uintmax_t) -1; return !i;]])],
-       [gl_cv_header_inttypes_h=yes],
-       [gl_cv_header_inttypes_h=no])])
-  if test $gl_cv_header_inttypes_h = yes; then
-    AC_DEFINE_UNQUOTED([HAVE_INTTYPES_H_WITH_UINTMAX], [1],
-      [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
-       and declares uintmax_t. ])
-  fi
-])
diff --git a/m4/isc-posix.m4 b/m4/isc-posix.m4
@@ -1,26 +0,0 @@
-# isc-posix.m4 serial 2 (gettext-0.11.2)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-# This file is not needed with autoconf-2.53 and newer.  Remove it in 2005.
-
-# This test replaces the one in autoconf.
-# Currently this macro should have the same name as the autoconf macro
-# because gettext's gettext.m4 (distributed in the automake package)
-# still uses it.  Otherwise, the use in gettext.m4 makes autoheader
-# give these diagnostics:
-#   configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
-#   configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
-
-undefine([AC_ISC_POSIX])
-
-AC_DEFUN([AC_ISC_POSIX],
-  [
-    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
-    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
-  ]
-)
diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4
@@ -1,35 +0,0 @@
-# lcmessage.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1995-2002, 2004-2005, 2008-2014 Free Software Foundation,
-dnl Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995.
-
-# Check whether LC_MESSAGES is available in <locale.h>.
-
-AC_DEFUN([gt_LC_MESSAGES],
-[
-  AC_CACHE_CHECK([for LC_MESSAGES], [gt_cv_val_LC_MESSAGES],
-    [AC_LINK_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <locale.h>]],
-          [[return LC_MESSAGES]])],
-       [gt_cv_val_LC_MESSAGES=yes],
-       [gt_cv_val_LC_MESSAGES=no])])
-  if test $gt_cv_val_LC_MESSAGES = yes; then
-    AC_DEFINE([HAVE_LC_MESSAGES], [1],
-      [Define if your <locale.h> file defines LC_MESSAGES.])
-  fi
-])
diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4
@@ -1,168 +0,0 @@
-# lib-ld.m4 serial 9
-dnl Copyright (C) 1996-2003, 2009-2020 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl Subroutines of libtool.m4,
-dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid
-dnl collision with libtool.m4.
-
-dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no.
-AC_DEFUN([AC_LIB_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes
-  ;;
-*)
-  acl_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$acl_cv_prog_gnu_ld
-])
-
-dnl From libtool-2.4. Sets the variable LD.
-AC_DEFUN([AC_LIB_PROG_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-
-AC_ARG_WITH([gnu-ld],
-    [AS_HELP_STRING([--with-gnu-ld],
-        [assume the C compiler uses GNU ld [default=no]])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])dnl
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
-fi
-
-if test -n "$LD"; then
-  AC_MSG_CHECKING([for ld])
-elif test "$GCC" = yes; then
-  AC_MSG_CHECKING([for ld used by $CC])
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-if test -n "$LD"; then
-  # Let the user override the test with a path.
-  :
-else
-  AC_CACHE_VAL([acl_cv_path_LD],
-  [
-    acl_cv_path_LD= # Final result of this test
-    ac_prog=ld # Program to search in $PATH
-    if test "$GCC" = yes; then
-      # Check if gcc -print-prog-name=ld gives a path.
-      case $host in
-        *-*-mingw*)
-          # gcc leaves a trailing carriage return which upsets mingw
-          acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-        *)
-          acl_output=`($CC -print-prog-name=ld) 2>&5` ;;
-      esac
-      case $acl_output in
-        # Accept absolute paths.
-        [[\\/]]* | ?:[[\\/]]*)
-          re_direlt='/[[^/]][[^/]]*/\.\./'
-          # Canonicalize the pathname of ld
-          acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'`
-          while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do
-            acl_output=`echo $acl_output | sed "s%$re_direlt%/%"`
-          done
-          # Got the pathname. No search in PATH is needed.
-          acl_cv_path_LD="$acl_output"
-          ac_prog=
-          ;;
-        "")
-          # If it fails, then pretend we aren't using GCC.
-          ;;
-        *)
-          # If it is relative, then search for the first ld in PATH.
-          with_gnu_ld=unknown
-          ;;
-      esac
-    fi
-    if test -n "$ac_prog"; then
-      # Search for $ac_prog in $PATH.
-      acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-      for ac_dir in $PATH; do
-        IFS="$acl_save_ifs"
-        test -z "$ac_dir" && ac_dir=.
-        if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-          acl_cv_path_LD="$ac_dir/$ac_prog"
-          # Check to see if the program is GNU ld.  I'd rather use --version,
-          # but apparently some variants of GNU ld only accept -v.
-          # Break only if it was the GNU/non-GNU ld that we prefer.
-          case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
-            *GNU* | *'with BFD'*)
-              test "$with_gnu_ld" != no && break
-              ;;
-            *)
-              test "$with_gnu_ld" != yes && break
-              ;;
-          esac
-        fi
-      done
-      IFS="$acl_save_ifs"
-    fi
-    case $host in
-      *-*-aix*)
-        AC_COMPILE_IFELSE(
-          [AC_LANG_SOURCE(
-             [[#if defined __powerpc64__ || defined _ARCH_PPC64
-                int ok;
-               #else
-                error fail
-               #endif
-             ]])],
-          [# The compiler produces 64-bit code. Add option '-b64' so that the
-           # linker groks 64-bit object files.
-           case "$acl_cv_path_LD " in
-             *" -b64 "*) ;;
-             *) acl_cv_path_LD="$acl_cv_path_LD -b64" ;;
-           esac
-          ], [])
-        ;;
-      sparc64-*-netbsd*)
-        AC_COMPILE_IFELSE(
-          [AC_LANG_SOURCE(
-             [[#if defined __sparcv9 || defined __arch64__
-                int ok;
-               #else
-                error fail
-               #endif
-             ]])],
-          [],
-          [# The compiler produces 32-bit code. Add option '-m elf32_sparc'
-           # so that the linker groks 32-bit object files.
-           case "$acl_cv_path_LD " in
-             *" -m elf32_sparc "*) ;;
-             *) acl_cv_path_LD="$acl_cv_path_LD -m elf32_sparc" ;;
-           esac
-          ])
-        ;;
-    esac
-  ])
-  LD="$acl_cv_path_LD"
-fi
-if test -n "$LD"; then
-  AC_MSG_RESULT([$LD])
-else
-  AC_MSG_RESULT([no])
-  AC_MSG_ERROR([no acceptable ld found in \$PATH])
-fi
-AC_LIB_PROG_LD_GNU
-])
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
@@ -1,800 +0,0 @@
-# lib-link.m4 serial 31
-dnl Copyright (C) 2001-2020 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_PREREQ([2.61])
-
-dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
-dnl augments the CPPFLAGS variable.
-dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
-dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN([AC_LIB_LINKFLAGS],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-  pushdef([Name],[m4_translit([$1],[./+-], [____])])
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
-    AC_LIB_LINKFLAGS_BODY([$1], [$2])
-    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
-    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
-    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
-    ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
-  ])
-  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
-  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
-  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
-  LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
-  AC_SUBST([LIB]NAME[_PREFIX])
-  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
-  dnl results of this search when this library appears as a dependency.
-  HAVE_LIB[]NAME=yes
-  popdef([NAME])
-  popdef([Name])
-])
-
-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
-dnl searches for libname and the libraries corresponding to explicit and
-dnl implicit dependencies, together with the specified include files and
-dnl the ability to compile and link the specified testcode. The missing-message
-dnl defaults to 'no' and may contain additional hints for the user.
-dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
-dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
-dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
-dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
-dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
-dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-  pushdef([Name],[m4_translit([$1],[./+-], [____])])
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-
-  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([$1], [$2])
-
-  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed lib[]Name and not disabled its use
-  dnl via --without-lib[]Name-prefix, he wants to use it.
-  ac_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-
-  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
-    ac_save_LIBS="$LIBS"
-    dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
-    dnl because these -l options might require -L options that are present in
-    dnl LIBS. -l options benefit only from the -L options listed before it.
-    dnl Otherwise, add it to the front of LIBS, because it may be a static
-    dnl library that depends on another static library that is present in LIBS.
-    dnl Static libraries benefit only from the static libraries listed after
-    dnl it.
-    case " $LIB[]NAME" in
-      *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
-      *)       LIBS="$LIB[]NAME $LIBS" ;;
-    esac
-    AC_LINK_IFELSE(
-      [AC_LANG_PROGRAM([[$3]], [[$4]])],
-      [ac_cv_lib[]Name=yes],
-      [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
-    LIBS="$ac_save_LIBS"
-  ])
-  if test "$ac_cv_lib[]Name" = yes; then
-    HAVE_LIB[]NAME=yes
-    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
-    AC_MSG_CHECKING([how to link with lib[]$1])
-    AC_MSG_RESULT([$LIB[]NAME])
-  else
-    HAVE_LIB[]NAME=no
-    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
-    dnl $INC[]NAME either.
-    CPPFLAGS="$ac_save_CPPFLAGS"
-    LIB[]NAME=
-    LTLIB[]NAME=
-    LIB[]NAME[]_PREFIX=
-  fi
-  AC_SUBST([HAVE_LIB]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
-  AC_SUBST([LIB]NAME[_PREFIX])
-  popdef([NAME])
-  popdef([Name])
-])
-
-dnl Determine the platform dependent parameters needed to use rpath:
-dnl   acl_libext,
-dnl   acl_shlibext,
-dnl   acl_libname_spec,
-dnl   acl_library_names_spec,
-dnl   acl_hardcode_libdir_flag_spec,
-dnl   acl_hardcode_libdir_separator,
-dnl   acl_hardcode_direct,
-dnl   acl_hardcode_minus_L.
-AC_DEFUN([AC_LIB_RPATH],
-[
-  dnl Complain if config.rpath is missing.
-  AC_REQUIRE_AUX_FILE([config.rpath])
-  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
-  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
-  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
-  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
-  AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
-    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
-    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
-    . ./conftest.sh
-    rm -f ./conftest.sh
-    acl_cv_rpath=done
-  ])
-  wl="$acl_cv_wl"
-  acl_libext="$acl_cv_libext"
-  acl_shlibext="$acl_cv_shlibext"
-  acl_libname_spec="$acl_cv_libname_spec"
-  acl_library_names_spec="$acl_cv_library_names_spec"
-  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  acl_hardcode_direct="$acl_cv_hardcode_direct"
-  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
-  dnl Determine whether the user wants rpath handling at all.
-  AC_ARG_ENABLE([rpath],
-    [  --disable-rpath         do not hardcode runtime library paths],
-    :, enable_rpath=yes)
-])
-
-dnl AC_LIB_FROMPACKAGE(name, package)
-dnl declares that libname comes from the given package. The configure file
-dnl will then not have a --with-libname-prefix option but a
-dnl --with-package-prefix option. Several libraries can come from the same
-dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
-dnl macro call that searches for libname.
-AC_DEFUN([AC_LIB_FROMPACKAGE],
-[
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-  define([acl_frompackage_]NAME, [$2])
-  popdef([NAME])
-  pushdef([PACK],[$2])
-  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
-                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-  define([acl_libsinpackage_]PACKUP,
-    m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1])
-  popdef([PACKUP])
-  popdef([PACK])
-])
-
-dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
-dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
-dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-  pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
-  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
-                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-  pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX([
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-    eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
-    eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
-  ])
-  AC_ARG_WITH(PACK[-prefix],
-[[  --with-]]PACK[[-prefix[=DIR]  search for ]PACKLIBS[ in DIR/include and DIR/lib
-  --without-]]PACK[[-prefix     don't search for ]PACKLIBS[ in includedir and libdir]],
-[
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-          eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
-          eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
-        ])
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/$acl_libdirstem"
-        additional_libdir2="$withval/$acl_libdirstem2"
-        additional_libdir3="$withval/$acl_libdirstem3"
-      fi
-    fi
-])
-  if test "X$additional_libdir2" = "X$additional_libdir"; then
-    additional_libdir2=
-  fi
-  if test "X$additional_libdir3" = "X$additional_libdir"; then
-    additional_libdir3=
-  fi
-  dnl Search the library and its dependencies in $additional_libdir and
-  dnl $LDFLAGS. Using breadth-first-seach.
-  LIB[]NAME=
-  LTLIB[]NAME=
-  INC[]NAME=
-  LIB[]NAME[]_PREFIX=
-  dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
-  dnl computed. So it has to be reset here.
-  HAVE_LIB[]NAME=
-  rpathdirs=
-  ltrpathdirs=
-  names_already_handled=
-  names_next_round='$1 $2'
-  while test -n "$names_next_round"; do
-    names_this_round="$names_next_round"
-    names_next_round=
-    for name in $names_this_round; do
-      already_handled=
-      for n in $names_already_handled; do
-        if test "$n" = "$name"; then
-          already_handled=yes
-          break
-        fi
-      done
-      if test -z "$already_handled"; then
-        names_already_handled="$names_already_handled $name"
-        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
-        dnl or AC_LIB_HAVE_LINKFLAGS call.
-        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
-        eval value=\"\$HAVE_LIB$uppername\"
-        if test -n "$value"; then
-          if test "$value" = yes; then
-            eval value=\"\$LIB$uppername\"
-            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
-            eval value=\"\$LTLIB$uppername\"
-            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
-          else
-            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
-            dnl that this library doesn't exist. So just drop it.
-            :
-          fi
-        else
-          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
-          dnl and the already constructed $LIBNAME/$LTLIBNAME.
-          found_dir=
-          found_la=
-          found_so=
-          found_a=
-          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
-          if test -n "$acl_shlibext"; then
-            shrext=".$acl_shlibext"             # typically: shrext=.so
-          else
-            shrext=
-          fi
-          if test $use_additional = yes; then
-            for additional_libdir_variable in additional_libdir additional_libdir2 additional_libdir3; do
-              if test "X$found_dir" = "X"; then
-                eval dir=\$$additional_libdir_variable
-                if test -n "$dir"; then
-                  dnl The same code as in the loop below:
-                  dnl First look for a shared library.
-                  if test -n "$acl_shlibext"; then
-                    if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then
-                      found_dir="$dir"
-                      found_so="$dir/$libname$shrext"
-                    else
-                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                        ver=`(cd "$dir" && \
-                              for f in "$libname$shrext".*; do echo "$f"; done \
-                              | sed -e "s,^$libname$shrext\\\\.,," \
-                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                              | sed 1q ) 2>/dev/null`
-                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then
-                          found_dir="$dir"
-                          found_so="$dir/$libname$shrext.$ver"
-                        fi
-                      else
-                        eval library_names=\"$acl_library_names_spec\"
-                        for f in $library_names; do
-                          if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then
-                            found_dir="$dir"
-                            found_so="$dir/$f"
-                            break
-                          fi
-                        done
-                      fi
-                    fi
-                  fi
-                  dnl Then look for a static library.
-                  if test "X$found_dir" = "X"; then
-                    if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then
-                      found_dir="$dir"
-                      found_a="$dir/$libname.$acl_libext"
-                    fi
-                  fi
-                  if test "X$found_dir" != "X"; then
-                    if test -f "$dir/$libname.la"; then
-                      found_la="$dir/$libname.la"
-                    fi
-                  fi
-                fi
-              fi
-            done
-          fi
-          if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LTLIB[]NAME; do
-              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-              case "$x" in
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  dnl First look for a shared library.
-                  if test -n "$acl_shlibext"; then
-                    if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then
-                      found_dir="$dir"
-                      found_so="$dir/$libname$shrext"
-                    else
-                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                        ver=`(cd "$dir" && \
-                              for f in "$libname$shrext".*; do echo "$f"; done \
-                              | sed -e "s,^$libname$shrext\\\\.,," \
-                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                              | sed 1q ) 2>/dev/null`
-                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then
-                          found_dir="$dir"
-                          found_so="$dir/$libname$shrext.$ver"
-                        fi
-                      else
-                        eval library_names=\"$acl_library_names_spec\"
-                        for f in $library_names; do
-                          if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then
-                            found_dir="$dir"
-                            found_so="$dir/$f"
-                            break
-                          fi
-                        done
-                      fi
-                    fi
-                  fi
-                  dnl Then look for a static library.
-                  if test "X$found_dir" = "X"; then
-                    if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then
-                      found_dir="$dir"
-                      found_a="$dir/$libname.$acl_libext"
-                    fi
-                  fi
-                  if test "X$found_dir" != "X"; then
-                    if test -f "$dir/$libname.la"; then
-                      found_la="$dir/$libname.la"
-                    fi
-                  fi
-                  ;;
-              esac
-              if test "X$found_dir" != "X"; then
-                break
-              fi
-            done
-          fi
-          if test "X$found_dir" != "X"; then
-            dnl Found the library.
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
-            if test "X$found_so" != "X"; then
-              dnl Linking with a shared library. We attempt to hardcode its
-              dnl directory into the executable's runpath, unless it's the
-              dnl standard /usr/lib.
-              if test "$enable_rpath" = no \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem2" \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem3"; then
-                dnl No hardcoding is needed.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-              else
-                dnl Use an explicit option to hardcode DIR into the resulting
-                dnl binary.
-                dnl Potentially add DIR to ltrpathdirs.
-                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                haveit=
-                for x in $ltrpathdirs; do
-                  if test "X$x" = "X$found_dir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  ltrpathdirs="$ltrpathdirs $found_dir"
-                fi
-                dnl The hardcoding into $LIBNAME is system dependent.
-                if test "$acl_hardcode_direct" = yes; then
-                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
-                  dnl resulting binary.
-                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                else
-                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
-                    dnl Use an explicit option to hardcode DIR into the resulting
-                    dnl binary.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    dnl Potentially add DIR to rpathdirs.
-                    dnl The rpathdirs will be appended to $LIBNAME at the end.
-                    haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $found_dir"
-                    fi
-                  else
-                    dnl Rely on "-L$found_dir".
-                    dnl But don't add it if it's already contained in the LDFLAGS
-                    dnl or the already constructed $LIBNAME
-                    haveit=
-                    for x in $LDFLAGS $LIB[]NAME; do
-                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                      if test "X$x" = "X-L$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
-                    fi
-                    if test "$acl_hardcode_minus_L" != no; then
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    else
-                      dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
-                      dnl here, because this doesn't fit in flags passed to the
-                      dnl compiler. So give up. No hardcoding. This affects only
-                      dnl very old systems.
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-                    fi
-                  fi
-                fi
-              fi
-            else
-              if test "X$found_a" != "X"; then
-                dnl Linking with a static library.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
-              else
-                dnl We shouldn't come here, but anyway it's good to have a
-                dnl fallback.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
-              fi
-            fi
-            dnl Assume the include files are nearby.
-            additional_includedir=
-            case "$found_dir" in
-              */$acl_libdirstem | */$acl_libdirstem/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
-                if test "$name" = '$1'; then
-                  LIB[]NAME[]_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-              */$acl_libdirstem2 | */$acl_libdirstem2/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
-                if test "$name" = '$1'; then
-                  LIB[]NAME[]_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-              */$acl_libdirstem3 | */$acl_libdirstem3/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem3/"'*$,,'`
-                if test "$name" = '$1'; then
-                  LIB[]NAME[]_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-            esac
-            if test "X$additional_includedir" != "X"; then
-              dnl Potentially add $additional_includedir to $INCNAME.
-              dnl But don't add it
-              dnl   1. if it's the standard /usr/include,
-              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
-              dnl   3. if it's already present in $CPPFLAGS or the already
-              dnl      constructed $INCNAME,
-              dnl   4. if it doesn't exist as a directory.
-              if test "X$additional_includedir" != "X/usr/include"; then
-                haveit=
-                if test "X$additional_includedir" = "X/usr/local/include"; then
-                  if test -n "$GCC"; then
-                    case $host_os in
-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                    esac
-                  fi
-                fi
-                if test -z "$haveit"; then
-                  for x in $CPPFLAGS $INC[]NAME; do
-                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                    if test "X$x" = "X-I$additional_includedir"; then
-                      haveit=yes
-                      break
-                    fi
-                  done
-                  if test -z "$haveit"; then
-                    if test -d "$additional_includedir"; then
-                      dnl Really add $additional_includedir to $INCNAME.
-                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
-                    fi
-                  fi
-                fi
-              fi
-            fi
-            dnl Look for dependencies.
-            if test -n "$found_la"; then
-              dnl Read the .la file. It defines the variables
-              dnl dlname, library_names, old_library, dependency_libs, current,
-              dnl age, revision, installed, dlopen, dlpreopen, libdir.
-              save_libdir="$libdir"
-              case "$found_la" in
-                */* | *\\*) . "$found_la" ;;
-                *) . "./$found_la" ;;
-              esac
-              libdir="$save_libdir"
-              dnl We use only dependency_libs.
-              for dep in $dependency_libs; do
-                case "$dep" in
-                  -L*)
-                    dependency_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                    dnl Potentially add $dependency_libdir to $LIBNAME and $LTLIBNAME.
-                    dnl But don't add it
-                    dnl   1. if it's the standard /usr/lib,
-                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
-                    dnl   3. if it's already present in $LDFLAGS or the already
-                    dnl      constructed $LIBNAME,
-                    dnl   4. if it doesn't exist as a directory.
-                    if test "X$dependency_libdir" != "X/usr/$acl_libdirstem" \
-                       && test "X$dependency_libdir" != "X/usr/$acl_libdirstem2" \
-                       && test "X$dependency_libdir" != "X/usr/$acl_libdirstem3"; then
-                      haveit=
-                      if test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem" \
-                         || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem2" \
-                         || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem3"; then
-                        if test -n "$GCC"; then
-                          case $host_os in
-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                          esac
-                        fi
-                      fi
-                      if test -z "$haveit"; then
-                        haveit=
-                        for x in $LDFLAGS $LIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$dependency_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$dependency_libdir"; then
-                            dnl Really add $dependency_libdir to $LIBNAME.
-                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$dependency_libdir"
-                          fi
-                        fi
-                        haveit=
-                        for x in $LDFLAGS $LTLIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$dependency_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$dependency_libdir"; then
-                            dnl Really add $dependency_libdir to $LTLIBNAME.
-                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$dependency_libdir"
-                          fi
-                        fi
-                      fi
-                    fi
-                    ;;
-                  -R*)
-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    if test "$enable_rpath" != no; then
-                      dnl Potentially add DIR to rpathdirs.
-                      dnl The rpathdirs will be appended to $LIBNAME at the end.
-                      haveit=
-                      for x in $rpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        rpathdirs="$rpathdirs $dir"
-                      fi
-                      dnl Potentially add DIR to ltrpathdirs.
-                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                      haveit=
-                      for x in $ltrpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        ltrpathdirs="$ltrpathdirs $dir"
-                      fi
-                    fi
-                    ;;
-                  -l*)
-                    dnl Handle this in the next round.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-                    ;;
-                  *.la)
-                    dnl Handle this in the next round. Throw away the .la's
-                    dnl directory; it is already contained in a preceding -L
-                    dnl option.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-                    ;;
-                  *)
-                    dnl Most likely an immediate library name.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
-                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
-                    ;;
-                esac
-              done
-            fi
-          else
-            dnl Didn't find the library; assume it is in the system directories
-            dnl known to the linker and runtime loader. (All the system
-            dnl directories known to the linker should also be known to the
-            dnl runtime loader, otherwise the system is severely misconfigured.)
-            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
-          fi
-        fi
-      fi
-    done
-  done
-  if test "X$rpathdirs" != "X"; then
-    if test -n "$acl_hardcode_libdir_separator"; then
-      dnl Weird platform: only the last -rpath option counts, the user must
-      dnl pass all path elements in one option. We can arrange that for a
-      dnl single library, but not when more than one $LIBNAMEs are used.
-      alldirs=
-      for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
-      done
-      dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
-      acl_save_libdir="$libdir"
-      libdir="$alldirs"
-      eval flag=\"$acl_hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
-      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-    else
-      dnl The -rpath options are cumulative.
-      for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-        eval flag=\"$acl_hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
-        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-      done
-    fi
-  fi
-  if test "X$ltrpathdirs" != "X"; then
-    dnl When using libtool, the option that works for both libraries and
-    dnl executables is -R. The -R options are cumulative.
-    for found_dir in $ltrpathdirs; do
-      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
-    done
-  fi
-  popdef([PACKLIBS])
-  popdef([PACKUP])
-  popdef([PACK])
-  popdef([NAME])
-])
-
-dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
-dnl unless already present in VAR.
-dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
-dnl contains two or three consecutive elements that belong together.
-AC_DEFUN([AC_LIB_APPENDTOVAR],
-[
-  for element in [$2]; do
-    haveit=
-    for x in $[$1]; do
-      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      [$1]="${[$1]}${[$1]:+ }$element"
-    fi
-  done
-])
-
-dnl For those cases where a variable contains several -L and -l options
-dnl referring to unknown libraries and directories, this macro determines the
-dnl necessary additional linker options for the runtime path.
-dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
-dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
-dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
-dnl otherwise linking without libtool is assumed.
-AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
-[
-  AC_REQUIRE([AC_LIB_RPATH])
-  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
-  $1=
-  if test "$enable_rpath" != no; then
-    if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
-      dnl Use an explicit option to hardcode directories into the resulting
-      dnl binary.
-      rpathdirs=
-      next=
-      for opt in $2; do
-        if test -n "$next"; then
-          dir="$next"
-          dnl No need to hardcode the standard /usr/lib.
-          if test "X$dir" != "X/usr/$acl_libdirstem" \
-             && test "X$dir" != "X/usr/$acl_libdirstem2" \
-             && test "X$dir" != "X/usr/$acl_libdirstem3"; then
-            rpathdirs="$rpathdirs $dir"
-          fi
-          next=
-        else
-          case $opt in
-            -L) next=yes ;;
-            -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
-                 dnl No need to hardcode the standard /usr/lib.
-                 if test "X$dir" != "X/usr/$acl_libdirstem" \
-                    && test "X$dir" != "X/usr/$acl_libdirstem2" \
-                    && test "X$dir" != "X/usr/$acl_libdirstem3"; then
-                   rpathdirs="$rpathdirs $dir"
-                 fi
-                 next= ;;
-            *) next= ;;
-          esac
-        fi
-      done
-      if test "X$rpathdirs" != "X"; then
-        if test -n ""$3""; then
-          dnl libtool is used for linking. Use -R options.
-          for dir in $rpathdirs; do
-            $1="${$1}${$1:+ }-R$dir"
-          done
-        else
-          dnl The linker is used for linking directly.
-          if test -n "$acl_hardcode_libdir_separator"; then
-            dnl Weird platform: only the last -rpath option counts, the user
-            dnl must pass all path elements in one option.
-            alldirs=
-            for dir in $rpathdirs; do
-              alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
-            done
-            acl_save_libdir="$libdir"
-            libdir="$alldirs"
-            eval flag=\"$acl_hardcode_libdir_flag_spec\"
-            libdir="$acl_save_libdir"
-            $1="$flag"
-          else
-            dnl The -rpath options are cumulative.
-            for dir in $rpathdirs; do
-              acl_save_libdir="$libdir"
-              libdir="$dir"
-              eval flag=\"$acl_hardcode_libdir_flag_spec\"
-              libdir="$acl_save_libdir"
-              $1="${$1}${$1:+ }$flag"
-            done
-          fi
-        fi
-      fi
-    fi
-  fi
-  AC_SUBST([$1])
-])
diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
@@ -1,320 +0,0 @@
-# lib-prefix.m4 serial 17
-dnl Copyright (C) 2001-2005, 2008-2020 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
-dnl to access previously installed libraries. The basic assumption is that
-dnl a user will want packages to use other packages he previously installed
-dnl with the same --prefix option.
-dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
-dnl libraries, but is otherwise very convenient.
-AC_DEFUN([AC_LIB_PREFIX],
-[
-  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX([
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-  ])
-  AC_ARG_WITH([lib-prefix],
-[[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
-  --without-lib-prefix    don't search for libraries in includedir and libdir]],
-[
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-        ])
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/$acl_libdirstem"
-      fi
-    fi
-])
-  if test $use_additional = yes; then
-    dnl Potentially add $additional_includedir to $CPPFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/include,
-    dnl   2. if it's already present in $CPPFLAGS,
-    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_includedir" != "X/usr/include"; then
-      haveit=
-      for x in $CPPFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-I$additional_includedir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_includedir" = "X/usr/local/include"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_includedir"; then
-            dnl Really add $additional_includedir to $CPPFLAGS.
-            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
-          fi
-        fi
-      fi
-    fi
-    dnl Potentially add $additional_libdir to $LDFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/lib,
-    dnl   2. if it's already present in $LDFLAGS,
-    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
-      haveit=
-      for x in $LDFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-L$additional_libdir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux*) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_libdir"; then
-            dnl Really add $additional_libdir to $LDFLAGS.
-            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
-          fi
-        fi
-      fi
-    fi
-  fi
-])
-
-dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
-dnl acl_final_exec_prefix, containing the values to which $prefix and
-dnl $exec_prefix will expand at the end of the configure script.
-AC_DEFUN([AC_LIB_PREPARE_PREFIX],
-[
-  dnl Unfortunately, prefix and exec_prefix get only finally determined
-  dnl at the end of configure.
-  if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-])
-
-dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
-dnl variables prefix and exec_prefix bound to the values they will have
-dnl at the end of the configure script.
-AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
-[
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  $1
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-])
-
-dnl AC_LIB_PREPARE_MULTILIB creates
-dnl - a function acl_is_expected_elfclass, that tests whether standard input
-dn;   has a 32-bit or 64-bit ELF header, depending on the host CPU ABI,
-dnl - 3 variables acl_libdirstem, acl_libdirstem2, acl_libdirstem3, containing
-dnl   the basename of the libdir to try in turn, either "lib" or "lib64" or
-dnl   "lib/64" or "lib32" or "lib/sparcv9" or "lib/amd64" or similar.
-AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
-[
-  dnl There is no formal standard regarding lib, lib32, and lib64.
-  dnl On most glibc systems, the current practice is that on a system supporting
-  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
-  dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. However, on
-  dnl Arch Linux based distributions, it's the opposite: 32-bit libraries go
-  dnl under $prefix/lib32 and 64-bit libraries go under $prefix/lib.
-  dnl We determine the compiler's default mode by looking at the compiler's
-  dnl library search path. If at least one of its elements ends in /lib64 or
-  dnl points to a directory whose absolute pathname ends in /lib64, we use that
-  dnl for 64-bit ABIs. Similarly for 32-bit ABIs. Otherwise we use the default,
-  dnl namely "lib".
-  dnl On Solaris systems, the current practice is that on a system supporting
-  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
-  dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
-  dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([gl_HOST_CPU_C_ABI_32BIT])
-
-  AC_CACHE_CHECK([for ELF binary format], [gl_cv_elf],
-    [AC_EGREP_CPP([Extensible Linking Format],
-       [#ifdef __ELF__
-        Extensible Linking Format
-        #endif
-       ],
-       [gl_cv_elf=yes],
-       [gl_cv_elf=no])
-     ])
-  if test $gl_cv_elf; then
-    # Extract the ELF class of a file (5th byte) in decimal.
-    # Cf. https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header
-    if od -A x < /dev/null >/dev/null 2>/dev/null; then
-      # Use POSIX od.
-      func_elfclass ()
-      {
-        od -A n -t d1 -j 4 -N 1
-      }
-    else
-      # Use BSD hexdump.
-      func_elfclass ()
-      {
-        dd bs=1 count=1 skip=4 2>/dev/null | hexdump -e '1/1 "%3d "'
-        echo
-      }
-    fi
-changequote(,)dnl
-    case $HOST_CPU_C_ABI_32BIT in
-      yes)
-        # 32-bit ABI.
-        acl_is_expected_elfclass ()
-        {
-          test "`func_elfclass | sed -e 's/[ 	]//g'`" = 1
-        }
-        ;;
-      no)
-        # 64-bit ABI.
-        acl_is_expected_elfclass ()
-        {
-          test "`func_elfclass | sed -e 's/[ 	]//g'`" = 2
-        }
-        ;;
-      *)
-        # Unknown.
-        acl_is_expected_elfclass ()
-        {
-          :
-        }
-        ;;
-    esac
-changequote([,])dnl
-  else
-    acl_is_expected_elfclass ()
-    {
-      :
-    }
-  fi
-
-  dnl Allow the user to override the result by setting acl_cv_libdirstems.
-  AC_CACHE_CHECK([for the common suffixes of directories in the library search path],
-    [acl_cv_libdirstems],
-    [dnl Try 'lib' first, because that's the default for libdir in GNU, see
-     dnl <https://www.gnu.org/prep/standards/html_node/Directory-Variables.html>.
-     acl_libdirstem=lib
-     acl_libdirstem2=
-     acl_libdirstem3=
-     case "$host_os" in
-       solaris*)
-         dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
-         dnl <https://docs.oracle.com/cd/E19253-01/816-5138/dev-env/index.html>.
-         dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
-         dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
-         dnl symlink is missing, so we set acl_libdirstem2 too.
-         if test $HOST_CPU_C_ABI_32BIT = no; then
-           acl_libdirstem2=lib/64
-           case "$host_cpu" in
-             sparc*)        acl_libdirstem3=lib/sparcv9 ;;
-             i*86 | x86_64) acl_libdirstem3=lib/amd64 ;;
-           esac
-         fi
-         ;;
-       *)
-         dnl If $CC generates code for a 32-bit ABI, the libraries are
-         dnl surely under $prefix/lib or $prefix/lib32, not $prefix/lib64.
-         dnl Similarly, if $CC generates code for a 64-bit ABI, the libraries
-         dnl are surely under $prefix/lib or $prefix/lib64, not $prefix/lib32.
-         dnl Find the compiler's search path. However, non-system compilers
-         dnl sometimes have odd library search paths. But we can't simply invoke
-         dnl '/usr/bin/gcc -print-search-dirs' because that would not take into
-         dnl account the -m32/-m31 or -m64 options from the $CC or $CFLAGS.
-         searchpath=`(LC_ALL=C $CC $CPPFLAGS $CFLAGS -print-search-dirs) 2>/dev/null \
-                     | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
-         if test $HOST_CPU_C_ABI_32BIT != no; then
-           # 32-bit or unknown ABI.
-           if test -d /usr/lib32; then
-             acl_libdirstem2=lib32
-           fi
-         fi
-         if test $HOST_CPU_C_ABI_32BIT != yes; then
-           # 64-bit or unknown ABI.
-           if test -d /usr/lib64; then
-             acl_libdirstem3=lib64
-           fi
-         fi
-         if test -n "$searchpath"; then
-           acl_save_IFS="${IFS= 	}"; IFS=":"
-           for searchdir in $searchpath; do
-             if test -d "$searchdir"; then
-               case "$searchdir" in
-                 */lib32/ | */lib32 ) acl_libdirstem2=lib32 ;;
-                 */lib64/ | */lib64 ) acl_libdirstem3=lib64 ;;
-                 */../ | */.. )
-                   # Better ignore directories of this form. They are misleading.
-                   ;;
-                 *) searchdir=`cd "$searchdir" && pwd`
-                    case "$searchdir" in
-                      */lib32 ) acl_libdirstem2=lib32 ;;
-                      */lib64 ) acl_libdirstem3=lib64 ;;
-                    esac ;;
-               esac
-             fi
-           done
-           IFS="$acl_save_IFS"
-           if test $HOST_CPU_C_ABI_32BIT = yes; then
-             # 32-bit ABI.
-             acl_libdirstem3=
-           fi
-           if test $HOST_CPU_C_ABI_32BIT = no; then
-             # 64-bit ABI.
-             acl_libdirstem2=
-           fi
-         fi
-         ;;
-     esac
-     test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
-     test -n "$acl_libdirstem3" || acl_libdirstem3="$acl_libdirstem"
-     acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2,$acl_libdirstem3"
-    ])
-  dnl Decompose acl_cv_libdirstems into acl_libdirstem, acl_libdirstem2, and
-  dnl acl_libdirstem3.
-changequote(,)dnl
-  acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'`
-  acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,//' -e 's/,.*//'`
-  acl_libdirstem3=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,[^,]*,//' -e 's/,.*//'`
-changequote([,])dnl
-])
diff --git a/m4/libcurl.m4 b/m4/libcurl.m4
@@ -1,272 +0,0 @@
-#***************************************************************************
-#                                  _   _ ____  _
-#  Project                     ___| | | |  _ \| |
-#                             / __| | | | |_) | |
-#                            | (__| |_| |  _ <| |___
-#                             \___|\___/|_| \_\_____|
-#
-# Copyright (C) 2006 - 2020, David Shaw <dshaw@jabberwocky.com>
-#
-# This software is licensed as described in the file COPYING, which
-# you should have received as part of this distribution. The terms
-# are also available at https://curl.se/docs/copyright.html.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the COPYING file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-###########################################################################
-# LIBCURL_CHECK_CONFIG ([DEFAULT-ACTION], [MINIMUM-VERSION],
-#                       [ACTION-IF-YES], [ACTION-IF-NO])
-# ----------------------------------------------------------
-#      David Shaw <dshaw@jabberwocky.com>   May-09-2006
-#
-# Checks for libcurl.  DEFAULT-ACTION is the string yes or no to
-# specify whether to default to --with-libcurl or --without-libcurl.
-# If not supplied, DEFAULT-ACTION is yes.  MINIMUM-VERSION is the
-# minimum version of libcurl to accept.  Pass the version as a regular
-# version number like 7.10.1. If not supplied, any version is
-# accepted.  ACTION-IF-YES is a list of shell commands to run if
-# libcurl was successfully found and passed the various tests.
-# ACTION-IF-NO is a list of shell commands that are run otherwise.
-# Note that using --without-libcurl does run ACTION-IF-NO.
-#
-# This macro #defines HAVE_LIBCURL if a working libcurl setup is
-# found, and sets @LIBCURL@ and @LIBCURL_CPPFLAGS@ to the necessary
-# values.  Other useful defines are LIBCURL_FEATURE_xxx where xxx are
-# the various features supported by libcurl, and LIBCURL_PROTOCOL_yyy
-# where yyy are the various protocols supported by libcurl.  Both xxx
-# and yyy are capitalized.  See the list of AH_TEMPLATEs at the top of
-# the macro for the complete list of possible defines.  Shell
-# variables $libcurl_feature_xxx and $libcurl_protocol_yyy are also
-# defined to 'yes' for those features and protocols that were found.
-# Note that xxx and yyy keep the same capitalization as in the
-# curl-config list (e.g. it's "HTTP" and not "http").
-#
-# Users may override the detected values by doing something like:
-# LIBCURL="-lcurl" LIBCURL_CPPFLAGS="-I/usr/myinclude" ./configure
-#
-# For the sake of sanity, this macro assumes that any libcurl that is
-# found is after version 7.7.2, the first version that included the
-# curl-config script.  Note that it is very important for people
-# packaging binary versions of libcurl to include this script!
-# Without curl-config, we can only guess what protocols are available,
-# or use curl_version_info to figure it out at runtime.
-
-AC_DEFUN([LIBCURL_CHECK_CONFIG],
-[
-  AH_TEMPLATE([LIBCURL_FEATURE_SSL],[Defined if libcurl supports SSL])
-  AH_TEMPLATE([LIBCURL_FEATURE_KRB4],[Defined if libcurl supports KRB4])
-  AH_TEMPLATE([LIBCURL_FEATURE_IPV6],[Defined if libcurl supports IPv6])
-  AH_TEMPLATE([LIBCURL_FEATURE_LIBZ],[Defined if libcurl supports libz])
-  AH_TEMPLATE([LIBCURL_FEATURE_ASYNCHDNS],[Defined if libcurl supports AsynchDNS])
-  AH_TEMPLATE([LIBCURL_FEATURE_IDN],[Defined if libcurl supports IDN])
-  AH_TEMPLATE([LIBCURL_FEATURE_SSPI],[Defined if libcurl supports SSPI])
-  AH_TEMPLATE([LIBCURL_FEATURE_NTLM],[Defined if libcurl supports NTLM])
-
-  AH_TEMPLATE([LIBCURL_PROTOCOL_HTTP],[Defined if libcurl supports HTTP])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_HTTPS],[Defined if libcurl supports HTTPS])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_FTP],[Defined if libcurl supports FTP])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_FTPS],[Defined if libcurl supports FTPS])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_FILE],[Defined if libcurl supports FILE])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_TELNET],[Defined if libcurl supports TELNET])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_LDAP],[Defined if libcurl supports LDAP])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_DICT],[Defined if libcurl supports DICT])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_TFTP],[Defined if libcurl supports TFTP])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_RTSP],[Defined if libcurl supports RTSP])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_POP3],[Defined if libcurl supports POP3])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_IMAP],[Defined if libcurl supports IMAP])
-  AH_TEMPLATE([LIBCURL_PROTOCOL_SMTP],[Defined if libcurl supports SMTP])
-
-  AC_ARG_WITH(libcurl,
-     AS_HELP_STRING([--with-libcurl=PREFIX],[look for the curl library in PREFIX/lib and headers in PREFIX/include]),
-     [_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])])
-
-  if test "$_libcurl_with" != "no" ; then
-
-     AC_PROG_AWK
-
-     _libcurl_version_parse="eval $AWK '{split(\$NF,A,\".\"); X=256*256*A[[1]]+256*A[[2]]+A[[3]]; print X;}'"
-
-     _libcurl_try_link=yes
-
-     if test -d "$_libcurl_with" ; then
-        LIBCURL_CPPFLAGS="-I$withval/include"
-        _libcurl_ldflags="-L$withval/lib"
-        AC_PATH_PROG([_libcurl_config],[curl-config],[],
-                     ["$withval/bin"])
-     else
-        AC_PATH_PROG([_libcurl_config],[curl-config],[],[$PATH])
-     fi
-
-     if test x$_libcurl_config != "x" ; then
-        AC_CACHE_CHECK([for the version of libcurl],
-           [libcurl_cv_lib_curl_version],
-           [libcurl_cv_lib_curl_version=`$_libcurl_config --version | $AWK '{print $[]2}'`])
-
-        _libcurl_version=`echo $libcurl_cv_lib_curl_version | $_libcurl_version_parse`
-        _libcurl_wanted=`echo ifelse([$2],,[0],[$2]) | $_libcurl_version_parse`
-
-        if test $_libcurl_wanted -gt 0 ; then
-           AC_CACHE_CHECK([for libcurl >= version $2],
-              [libcurl_cv_lib_version_ok],
-              [
-              if test $_libcurl_version -ge $_libcurl_wanted ; then
-                 libcurl_cv_lib_version_ok=yes
-              else
-                 libcurl_cv_lib_version_ok=no
-              fi
-              ])
-        fi
-
-        if test $_libcurl_wanted -eq 0 || test x$libcurl_cv_lib_version_ok = xyes ; then
-           if test x"$LIBCURL_CPPFLAGS" = "x" ; then
-              LIBCURL_CPPFLAGS=`$_libcurl_config --cflags`
-           fi
-           if test x"$LIBCURL" = "x" ; then
-              LIBCURL=`$_libcurl_config --libs`
-
-              # This is so silly, but Apple actually has a bug in their
-              # curl-config script.  Fixed in Tiger, but there are still
-              # lots of Panther installs around.
-              case "${host}" in
-                 powerpc-apple-darwin7*)
-                    LIBCURL=`echo $LIBCURL | sed -e 's|-arch i386||g'`
-                 ;;
-              esac
-           fi
-
-           # All curl-config scripts support --feature
-           _libcurl_features=`$_libcurl_config --feature`
-
-           # Is it modern enough to have --protocols? (7.12.4)
-           if test $_libcurl_version -ge 461828 ; then
-              _libcurl_protocols=`$_libcurl_config --protocols`
-           fi
-        else
-           _libcurl_try_link=no
-        fi
-
-        unset _libcurl_wanted
-     fi
-
-     if test $_libcurl_try_link = yes ; then
-
-        # we didn't find curl-config, so let's see if the user-supplied
-        # link line (or failing that, "-lcurl") is enough.
-        LIBCURL=${LIBCURL-"$_libcurl_ldflags -lcurl"}
-
-        AC_CACHE_CHECK([whether libcurl is usable],
-           [libcurl_cv_lib_curl_usable],
-           [
-           _libcurl_save_cppflags=$CPPFLAGS
-           CPPFLAGS="$LIBCURL_CPPFLAGS $CPPFLAGS"
-           _libcurl_save_libs=$LIBS
-           LIBS="$LIBCURL $LIBS"
-
-           AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curl/curl.h>]],[[
-/* Try and use a few common options to force a failure if we are
-   missing symbols or can't link. */
-int x;
-curl_easy_setopt(NULL,CURLOPT_URL,NULL);
-x=CURL_ERROR_SIZE;
-x=CURLOPT_WRITEFUNCTION;
-x=CURLOPT_WRITEDATA;
-x=CURLOPT_ERRORBUFFER;
-x=CURLOPT_STDERR;
-x=CURLOPT_VERBOSE;
-if (x) {;}
-]])],libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no)
-
-           CPPFLAGS=$_libcurl_save_cppflags
-           LIBS=$_libcurl_save_libs
-           unset _libcurl_save_cppflags
-           unset _libcurl_save_libs
-           ])
-
-        if test $libcurl_cv_lib_curl_usable = yes ; then
-
-           # Does curl_free() exist in this version of libcurl?
-           # If not, fake it with free()
-
-           _libcurl_save_cppflags=$CPPFLAGS
-           CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS"
-           _libcurl_save_libs=$LIBS
-           LIBS="$LIBS $LIBCURL"
-
-           AC_CHECK_FUNC(curl_free,,
-              AC_DEFINE(curl_free,free,
-                [Define curl_free() as free() if our version of curl lacks curl_free.]))
-
-           CPPFLAGS=$_libcurl_save_cppflags
-           LIBS=$_libcurl_save_libs
-           unset _libcurl_save_cppflags
-           unset _libcurl_save_libs
-
-           AC_DEFINE(HAVE_LIBCURL,1,
-             [Define to 1 if you have a functional curl library.])
-           AC_SUBST(LIBCURL_CPPFLAGS)
-           AC_SUBST(LIBCURL)
-
-           for _libcurl_feature in $_libcurl_features ; do
-              AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_feature_$_libcurl_feature),[1])
-              eval AS_TR_SH(libcurl_feature_$_libcurl_feature)=yes
-           done
-
-           if test "x$_libcurl_protocols" = "x" ; then
-
-              # We don't have --protocols, so just assume that all
-              # protocols are available
-              _libcurl_protocols="HTTP FTP FILE TELNET LDAP DICT TFTP"
-
-              if test x$libcurl_feature_SSL = xyes ; then
-                 _libcurl_protocols="$_libcurl_protocols HTTPS"
-
-                 # FTPS wasn't standards-compliant until version
-                 # 7.11.0 (0x070b00 == 461568)
-                 if test $_libcurl_version -ge 461568; then
-                    _libcurl_protocols="$_libcurl_protocols FTPS"
-                 fi
-              fi
-
-              # RTSP, IMAP, POP3 and SMTP were added in
-              # 7.20.0 (0x071400 == 463872)
-              if test $_libcurl_version -ge 463872; then
-                 _libcurl_protocols="$_libcurl_protocols RTSP IMAP POP3 SMTP"
-              fi
-           fi
-
-           for _libcurl_protocol in $_libcurl_protocols ; do
-              AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_protocol_$_libcurl_protocol),[1])
-              eval AS_TR_SH(libcurl_protocol_$_libcurl_protocol)=yes
-           done
-        else
-           unset LIBCURL
-           unset LIBCURL_CPPFLAGS
-        fi
-     fi
-
-     unset _libcurl_try_link
-     unset _libcurl_version_parse
-     unset _libcurl_config
-     unset _libcurl_feature
-     unset _libcurl_features
-     unset _libcurl_protocol
-     unset _libcurl_protocols
-     unset _libcurl_version
-     unset _libcurl_ldflags
-  fi
-
-  if test x$_libcurl_with = xno || test x$libcurl_cv_lib_curl_usable != xyes ; then
-     # This is the IF-NO path
-     ifelse([$4],,:,[$4])
-  else
-     # This is the IF-YES path
-     ifelse([$3],,:,[$3])
-  fi
-
-  unset _libcurl_with
-])dnl
diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
@@ -1,254 +0,0 @@
-# libgcrypt.m4 - Autoconf macros to detect libgcrypt
-# Copyright (C) 2002, 2003, 2004, 2011, 2014, 2018, 2020,
-#               2024 g10 Code GmbH
-#
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-#
-# This file is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# Last-changed: 2024-06-13
-
-
-dnl
-dnl Find gpgrt-config, which uses .pc file
-dnl (minimum pkg-config functionality, supporting cross build)
-dnl
-dnl _AM_PATH_GPGRT_CONFIG
-AC_DEFUN([_AM_PATH_GPGRT_CONFIG],[dnl
-  AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no, [$prefix/bin:$PATH])
-  if test "$GPGRT_CONFIG" != "no"; then
-    # Determine gpgrt_libdir
-    #
-    # Get the prefix of gpgrt-config assuming it's something like:
-    #   <PREFIX>/bin/gpgrt-config
-    gpgrt_prefix=${GPGRT_CONFIG%/*/*}
-    possible_libdir1=${gpgrt_prefix}/lib
-    # Determine by using system libdir-format with CC, it's like:
-    #   Normal style: /usr/lib
-    #   GNU cross style: /usr/<triplet>/lib
-    #   Debian style: /usr/lib/<multiarch-name>
-    #   Fedora/openSUSE style: /usr/lib, /usr/lib32 or /usr/lib64
-    # It is assumed that CC is specified to the one of host on cross build.
-    if libdir_candidates=$(${CC:-cc} -print-search-dirs | \
-          sed -n -e "/^libraries/{s/libraries: =//;s/:/\\
-/g;p;}"); then
-      # From the output of -print-search-dirs, select valid pkgconfig dirs.
-      libdir_candidates=$(for dir in $libdir_candidates; do
-        if p=$(cd $dir 2>/dev/null && pwd); then
-          test -d "$p/pkgconfig" && echo $p;
-        fi
-      done)
-
-      for possible_libdir0 in $libdir_candidates; do
-        # possible_libdir0:
-        #   Fallback candidate, the one of system-installed (by $CC)
-        #   (/usr/<triplet>/lib, /usr/lib/<multiarch-name> or /usr/lib32)
-        # possible_libdir1:
-        #   Another candidate, user-locally-installed
-        #   (<gpgrt_prefix>/lib)
-        # possible_libdir2
-        #   Most preferred
-        #   (<gpgrt_prefix>/<triplet>/lib,
-        #    <gpgrt_prefix>/lib/<multiarch-name> or <gpgrt_prefix>/lib32)
-        if test "${possible_libdir0##*/}" = "lib"; then
-          possible_prefix0=${possible_libdir0%/lib}
-          possible_prefix0_triplet=${possible_prefix0##*/}
-          if test -z "$possible_prefix0_triplet"; then
-            continue
-          fi
-          possible_libdir2=${gpgrt_prefix}/$possible_prefix0_triplet/lib
-        else
-          possible_prefix0=${possible_libdir0%%/lib*}
-          possible_libdir2=${gpgrt_prefix}${possible_libdir0#$possible_prefix0}
-        fi
-        if test -f ${possible_libdir2}/pkgconfig/gpg-error.pc; then
-          gpgrt_libdir=${possible_libdir2}
-        elif test -f ${possible_libdir1}/pkgconfig/gpg-error.pc; then
-          gpgrt_libdir=${possible_libdir1}
-        elif test -f ${possible_libdir0}/pkgconfig/gpg-error.pc; then
-          gpgrt_libdir=${possible_libdir0}
-        fi
-        if test -n "$gpgrt_libdir"; then break; fi
-      done
-    fi
-    if test -z "$gpgrt_libdir"; then
-      # No valid pkgconfig dir in any of the system directories, fallback
-      gpgrt_libdir=${possible_libdir1}
-    fi
-  else
-    unset GPGRT_CONFIG
-  fi
-
-  if test -n "$gpgrt_libdir"; then
-    # Add the --libdir option to GPGRT_CONFIG
-    GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir"
-    # Make sure if gpgrt-config really works, by testing config gpg-error
-    if ! $GPGRT_CONFIG gpg-error --exists; then
-      # If it doesn't work, clear the GPGRT_CONFIG variable.
-      unset GPGRT_CONFIG
-    fi
-  else
-    # GPGRT_CONFIG found but no suitable dir for --libdir found.
-    # This is a failure.  Clear the GPGRT_CONFIG variable.
-    unset GPGRT_CONFIG
-  fi
-])
-
-dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
-dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
-dnl MINIMUM-VERSION is a string with the version number optionally prefixed
-dnl with the API version to also check the API compatibility. Example:
-dnl a MINIMUM-VERSION of 1:1.2.5 won't pass the test unless the installed
-dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1.  Using
-dnl this features allows to prevent build against newer versions of libgcrypt
-dnl with a changed API.
-dnl
-dnl If a prefix option is not used, the config script is first
-dnl searched in $SYSROOT/bin and then along $PATH.  If the used
-dnl config script does not match the host specification the script
-dnl is added to the gpg_config_script_warn variable.
-dnl
-AC_DEFUN([AM_PATH_LIBGCRYPT],
-[ AC_REQUIRE([AC_CANONICAL_HOST])dnl
-  AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl
-  AC_ARG_WITH(libgcrypt-prefix,
-            AS_HELP_STRING([--with-libgcrypt-prefix=PFX],
-                           [prefix where LIBGCRYPT is installed (optional)]),
-     libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
-  if test x"${LIBGCRYPT_CONFIG}" = x ; then
-     if test x"${libgcrypt_config_prefix}" != x ; then
-        LIBGCRYPT_CONFIG="${libgcrypt_config_prefix}/bin/libgcrypt-config"
-     fi
-  fi
-
-  use_gpgrt_config=""
-  if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
-    if $GPGRT_CONFIG libgcrypt --exists; then
-      LIBGCRYPT_CONFIG="$GPGRT_CONFIG libgcrypt"
-      AC_MSG_NOTICE([Use gpgrt-config as libgcrypt-config])
-      use_gpgrt_config=yes
-    fi
-  fi
-  if test -z "$use_gpgrt_config"; then
-    if test x"${LIBGCRYPT_CONFIG}" = x ; then
-      case "${SYSROOT}" in
-         /*)
-           if test -x "${SYSROOT}/bin/libgcrypt-config" ; then
-             LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config"
-           fi
-           ;;
-         '')
-           ;;
-          *)
-           AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
-           ;;
-      esac
-    fi
-    AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
-  fi
-
-  tmp=ifelse([$1], ,1:1.2.0,$1)
-  if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
-     req_libgcrypt_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
-     min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
-  else
-     req_libgcrypt_api=0
-     min_libgcrypt_version="$tmp"
-  fi
-
-  AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version)
-  ok=no
-  if test "$LIBGCRYPT_CONFIG" != "no" ; then
-    req_major=`echo $min_libgcrypt_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
-    req_minor=`echo $min_libgcrypt_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
-    req_micro=`echo $min_libgcrypt_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
-    if test -z "$use_gpgrt_config"; then
-      libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
-    else
-      libgcrypt_config_version=`$LIBGCRYPT_CONFIG --modversion`
-    fi
-    major=`echo $libgcrypt_config_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
-    minor=`echo $libgcrypt_config_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
-    micro=`echo $libgcrypt_config_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
-    if test "$major" -gt "$req_major"; then
-        ok=yes
-    else
-        if test "$major" -eq "$req_major"; then
-            if test "$minor" -gt "$req_minor"; then
-               ok=yes
-            else
-               if test "$minor" -eq "$req_minor"; then
-                   if test "$micro" -ge "$req_micro"; then
-                     ok=yes
-                   fi
-               fi
-            fi
-        fi
-    fi
-  fi
-  if test $ok = yes; then
-    AC_MSG_RESULT([yes ($libgcrypt_config_version)])
-  else
-    AC_MSG_RESULT(no)
-  fi
-  if test $ok = yes; then
-     # If we have a recent libgcrypt, we should also check that the
-     # API is compatible
-     if test "$req_libgcrypt_api" -gt 0 ; then
-        if test -z "$use_gpgrt_config"; then
-           tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
-	else
-           tmp=`$LIBGCRYPT_CONFIG --variable=api_version 2>/dev/null || echo 0`
-	fi
-        if test "$tmp" -gt 0 ; then
-           AC_MSG_CHECKING([LIBGCRYPT API version])
-           if test "$req_libgcrypt_api" -eq "$tmp" ; then
-             AC_MSG_RESULT([okay])
-           else
-             ok=no
-             AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp])
-           fi
-        fi
-     fi
-  fi
-  if test $ok = yes; then
-    LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
-    LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
-    ifelse([$2], , :, [$2])
-    if test -z "$use_gpgrt_config"; then
-      libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
-    else
-      libgcrypt_config_host=`$LIBGCRYPT_CONFIG --variable=host 2>/dev/null || echo none`
-    fi
-    if test x"$libgcrypt_config_host" != xnone ; then
-      if test x"$libgcrypt_config_host" != x"$host" ; then
-  AC_MSG_WARN([[
-***
-*** The config script "$LIBGCRYPT_CONFIG" was
-*** built for $libgcrypt_config_host and thus may not match the
-*** used host $host.
-*** You may want to use the configure option --with-libgcrypt-prefix
-*** to specify a matching config script or use \$SYSROOT.
-***]])
-        gpg_config_script_warn="$gpg_config_script_warn libgcrypt"
-      fi
-    fi
-  else
-    LIBGCRYPT_CFLAGS=""
-    LIBGCRYPT_LIBS=""
-    ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(LIBGCRYPT_CFLAGS)
-  AC_SUBST(LIBGCRYPT_LIBS)
-])
diff --git a/m4/libunistring.m4 b/m4/libunistring.m4
@@ -1,143 +0,0 @@
-# libunistring.m4 serial 12
-dnl Copyright (C) 2009-2021 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_PREREQ([2.64])
-
-dnl gl_LIBUNISTRING
-dnl Searches for an installed libunistring.
-dnl If found, it sets and AC_SUBSTs HAVE_LIBUNISTRING=yes and the LIBUNISTRING
-dnl and LTLIBUNISTRING variables, sets the LIBUNISTRING_VERSION variable, and
-dnl augments the CPPFLAGS variable, and #defines HAVE_LIBUNISTRING to 1.
-dnl Otherwise, it sets and AC_SUBSTs HAVE_LIBUNISTRING=no and LIBUNISTRING and
-dnl LTLIBUNISTRING to empty.
-
-dnl Define gl_LIBUNISTRING using AC_DEFUN_ONCE, in order dnl to avoid warnings
-dnl like
-dnl "warning: AC_REQUIRE: `gl_LIBUNISTRING' was expanded before it was required".
-dnl This is tricky because of the way 'aclocal' is implemented:
-dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
-dnl   Otherwise aclocal's initial scan pass would miss the macro definition.
-dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
-dnl   Otherwise aclocal would emit many "Use of uninitialized value $1"
-dnl   warnings.
-AC_DEFUN_ONCE([gl_LIBUNISTRING],
-[
-  AC_BEFORE([$0], [gl_LIBUNISTRING_MODULE])
-  AC_BEFORE([$0], [gl_LIBUNISTRING_LIBHEADER])
-  AC_BEFORE([$0], [gl_LIBUNISTRING_LIB_PREPARE])
-
-  m4_ifdef([gl_LIBUNISTRING_OPTIONAL],
-    [
-      AC_MSG_CHECKING([whether included libunistring is requested])
-      AC_ARG_WITH([included-libunistring],
-        [  --with-included-libunistring  use the libunistring parts included here],
-        [gl_libunistring_force_included=$withval],
-        [gl_libunistring_force_included=no])
-      AC_MSG_RESULT([$gl_libunistring_force_included])
-      gl_libunistring_use_included="$gl_libunistring_force_included"
-      if test "$gl_libunistring_use_included" = yes; then
-        dnl Assume that libunistring is not installed until some other macro
-        dnl explicitly invokes gl_LIBUNISTRING_CORE.
-        if test -z "$HAVE_LIBUNISTRING"; then
-          HAVE_LIBUNISTRING=no
-        fi
-        LIBUNISTRING=
-        LTLIBUNISTRING=
-      else
-        gl_LIBUNISTRING_CORE
-        if test $HAVE_LIBUNISTRING = no; then
-          gl_libunistring_use_included=yes
-          LIBUNISTRING=
-          LTLIBUNISTRING=
-        fi
-      fi
-    ],
-    [gl_LIBUNISTRING_CORE])
-])
-
-AC_DEFUN([gl_LIBUNISTRING_CORE],
-[
-  AC_REQUIRE([AM_ICONV])
-  if test -n "$LIBICONV"; then
-    dnl First, try to link without -liconv. libunistring often depends on
-    dnl libiconv, but we don't know (and often don't need to know) where
-    dnl libiconv is installed.
-    AC_LIB_HAVE_LINKFLAGS([unistring], [],
-      [#include <uniconv.h>], [u8_strconv_from_locale((char*)0);],
-      [no, trying again together with libiconv])
-    if test "$ac_cv_libunistring" != yes; then
-      dnl Second try, with -liconv.
-      dnl We have to erase the cached result of the first AC_LIB_HAVE_LINKFLAGS
-      dnl invocation, otherwise the second one will not be run.
-      unset ac_cv_libunistring
-      glus_save_LIBS="$LIBS"
-      LIBS="$LIBS $LIBICONV"
-      AC_LIB_HAVE_LINKFLAGS([unistring], [],
-        [#include <uniconv.h>], [u8_strconv_from_locale((char*)0);],
-        [no, consider installing GNU libunistring])
-      if test -n "$LIBUNISTRING"; then
-        LIBUNISTRING="$LIBUNISTRING $LIBICONV"
-        LTLIBUNISTRING="$LTLIBUNISTRING $LTLIBICONV"
-      fi
-      LIBS="$glus_save_LIBS"
-    fi
-  else
-    AC_LIB_HAVE_LINKFLAGS([unistring], [],
-      [#include <uniconv.h>], [u8_strconv_from_locale((char*)0);],
-      [no, consider installing GNU libunistring])
-  fi
-  if test $HAVE_LIBUNISTRING = yes; then
-    dnl Determine the installed version.
-    AC_CACHE_CHECK([for libunistring version], [gl_cv_libunistring_version],
-      [AC_COMPUTE_INT([gl_libunistring_hexversion],
-                      [_LIBUNISTRING_VERSION],
-                      [#include <unistring/version.h>])
-       dnl Versions <= 0.9.3 had a hexversion of 0x0009.
-       dnl Use other tests to distinguish them.
-       if test $gl_libunistring_hexversion = 9; then
-         dnl Version 0.9.2 introduced the header <unistring/cdefs.h>.
-         AC_COMPILE_IFELSE(
-           [AC_LANG_PROGRAM([[#include <unistring/cdefs.h>]], [[]])],
-           [gl_cv_libunistring_version092=true],
-           [gl_cv_libunistring_version092=false])
-         if $gl_cv_libunistring_version092; then
-           dnl Version 0.9.3 changed a comment in <unistr.h>.
-           gl_ABSOLUTE_HEADER_ONE([unistr.h])
-           if test -n "$gl_cv_absolute_unistr_h" \
-              && grep 'Copy no more than N units of SRC to DEST.  Return a pointer' $gl_cv_absolute_unistr_h > /dev/null; then
-             dnl Detected version 0.9.3.
-             gl_libunistring_hexversion=2307
-           else
-             dnl Detected version 0.9.2.
-             gl_libunistring_hexversion=2306
-           fi
-         else
-           dnl Version 0.9.1 introduced the type casing_suffix_context_t.
-           AC_COMPILE_IFELSE(
-             [AC_LANG_PROGRAM(
-                [[#include <unicase.h>
-                  casing_suffix_context_t ct;]],
-                [[]])],
-             [gl_cv_libunistring_version091=true],
-             [gl_cv_libunistring_version091=false])
-           if $gl_cv_libunistring_version091; then
-             dnl Detected version 0.9.1.
-             gl_libunistring_hexversion=2305
-           else
-             dnl Detected version 0.9.
-             gl_libunistring_hexversion=2304
-           fi
-         fi
-       fi
-       dnl Transform into the usual major.minor.subminor notation.
-       gl_libunistring_major=`expr $gl_libunistring_hexversion / 65536`
-       gl_libunistring_minor=`expr $gl_libunistring_hexversion / 256 % 256`
-       gl_libunistring_subminor=`expr $gl_libunistring_hexversion % 256`
-       gl_cv_libunistring_version="$gl_libunistring_major.$gl_libunistring_minor.$gl_libunistring_subminor"
-      ])
-    LIBUNISTRING_VERSION="$gl_cv_libunistring_version"
-  fi
-])
diff --git a/m4/libxml2.m4 b/m4/libxml2.m4
@@ -1,188 +0,0 @@
-# Configure paths for LIBXML2
-# Mike Hommey 2004-06-19
-# use CPPFLAGS instead of CFLAGS
-# Toshio Kuratomi 2001-04-21
-# Adapted from:
-# Configure paths for GLIB
-# Owen Taylor     97-11-3
-
-dnl AM_PATH_XML2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for XML, and define XML_CPPFLAGS and XML_LIBS
-dnl
-AC_DEFUN([AM_PATH_XML2],[
-AC_ARG_WITH(xml-prefix,
-            [  --with-xml-prefix=PFX   Prefix where libxml is installed (optional)],
-            xml_config_prefix="$withval", xml_config_prefix="")
-AC_ARG_WITH(xml-exec-prefix,
-            [  --with-xml-exec-prefix=PFX Exec prefix where libxml is installed (optional)],
-            xml_config_exec_prefix="$withval", xml_config_exec_prefix="")
-AC_ARG_ENABLE(xmltest,
-              [  --disable-xmltest       Do not try to compile and run a test LIBXML program],,
-              enable_xmltest=yes)
-
-  if test x$xml_config_exec_prefix != x ; then
-     xml_config_args="$xml_config_args"
-     if test x${XML2_CONFIG+set} != xset ; then
-        XML2_CONFIG=$xml_config_exec_prefix/bin/xml2-config
-     fi
-  fi
-  if test x$xml_config_prefix != x ; then
-     xml_config_args="$xml_config_args --prefix=$xml_config_prefix"
-     if test x${XML2_CONFIG+set} != xset ; then
-        XML2_CONFIG=$xml_config_prefix/bin/xml2-config
-     fi
-  fi
-
-  AC_PATH_PROG(XML2_CONFIG, xml2-config, no)
-  min_xml_version=ifelse([$1], ,2.0.0,[$1])
-  AC_MSG_CHECKING(for libxml - version >= $min_xml_version)
-  no_xml=""
-  if test "$XML2_CONFIG" = "no" ; then
-    no_xml=yes
-  else
-    XML_CPPFLAGS=`$XML2_CONFIG $xml_config_args --cflags`
-    XML_LIBS=`$XML2_CONFIG $xml_config_args --libs`
-    xml_config_major_version=`$XML2_CONFIG $xml_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    xml_config_minor_version=`$XML2_CONFIG $xml_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    xml_config_micro_version=`$XML2_CONFIG $xml_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_xmltest" = "xyes" ; then
-      ac_save_CPPFLAGS="$CPPFLAGS"
-      ac_save_LIBS="$LIBS"
-      CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
-      LIBS="$XML_LIBS $LIBS"
-dnl
-dnl Now check if the installed libxml is sufficiently new.
-dnl (Also sanity checks the results of xml2-config to some extent)
-dnl
-      rm -f conf.xmltest
-      AC_TRY_RUN([
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <libxml/xmlversion.h>
-
-int
-main()
-{
-  int xml_major_version, xml_minor_version, xml_micro_version;
-  int major, minor, micro;
-  char *tmp_version;
-
-  system("touch conf.xmltest");
-
-  /* Capture xml2-config output via autoconf/configure variables */
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = (char *)strdup("$min_xml_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string from xml2-config\n", "$min_xml_version");
-     exit(1);
-   }
-   free(tmp_version);
-
-   /* Capture the version information from the header files */
-   tmp_version = (char *)strdup(LIBXML_DOTTED_VERSION);
-   if (sscanf(tmp_version, "%d.%d.%d", &xml_major_version, &xml_minor_version, &xml_micro_version) != 3) {
-     printf("%s, bad version string from libxml includes\n", "LIBXML_DOTTED_VERSION");
-     exit(1);
-   }
-   free(tmp_version);
-
- /* Compare xml2-config output to the libxml headers */
-  if ((xml_major_version != $xml_config_major_version) ||
-      (xml_minor_version != $xml_config_minor_version) ||
-      (xml_micro_version != $xml_config_micro_version))
-    {
-      printf("*** libxml header files (version %d.%d.%d) do not match\n",
-         xml_major_version, xml_minor_version, xml_micro_version);
-      printf("*** xml2-config (version %d.%d.%d)\n",
-         $xml_config_major_version, $xml_config_minor_version, $xml_config_micro_version);
-      return 1;
-    }
-/* Compare the headers to the library to make sure we match */
-  /* Less than ideal -- doesn't provide us with return value feedback,
-   * only exits if there's a serious mismatch between header and library.
-   */
-    LIBXML_TEST_VERSION;
-
-    /* Test that the library is greater than our minimum version */
-    if ((xml_major_version > major) ||
-        ((xml_major_version == major) && (xml_minor_version > minor)) ||
-        ((xml_major_version == major) && (xml_minor_version == minor) &&
-        (xml_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of libxml (%d.%d.%d) was found.\n",
-               xml_major_version, xml_minor_version, xml_micro_version);
-        printf("*** You need a version of libxml newer than %d.%d.%d. The latest version of\n",
-           major, minor, micro);
-        printf("*** libxml is always available from ftp://ftp.xmlsoft.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the xml2-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of LIBXML, but you can also set the XML2_CONFIG environment to point to the\n");
-        printf("*** correct copy of xml2-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-    }
-  return 1;
-}
-],, no_xml=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CPPFLAGS="$ac_save_CPPFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-
-  if test "x$no_xml" = x ; then
-     AC_MSG_RESULT(yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version))
-     ifelse([$2], , :, [$2])
-  else
-     AC_MSG_RESULT(no)
-     if test "$XML2_CONFIG" = "no" ; then
-       echo "*** The xml2-config script installed by LIBXML could not be found"
-       echo "*** If libxml was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the XML2_CONFIG environment variable to the"
-       echo "*** full path to xml2-config."
-     else
-       if test -f conf.xmltest ; then
-        :
-       else
-          echo "*** Could not run libxml test program, checking why..."
-          CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
-          LIBS="$LIBS $XML_LIBS"
-          AC_TRY_LINK([
-#include <libxml/xmlversion.h>
-#include <stdio.h>
-],      [ LIBXML_TEST_VERSION; return 0;],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding LIBXML or finding the wrong"
-          echo "*** version of LIBXML. If it is not finding LIBXML, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-          echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occurred. This usually means LIBXML was incorrectly installed"
-          echo "*** or that you have moved LIBXML since it was installed. In the latter case, you"
-          echo "*** may want to edit the xml2-config script: $XML2_CONFIG" ])
-          CPPFLAGS="$ac_save_CPPFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-
-     XML_CPPFLAGS=""
-     XML_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(XML_CPPFLAGS)
-  AC_SUBST(XML_LIBS)
-  rm -f conf.xmltest
-])
diff --git a/m4/lock.m4 b/m4/lock.m4
@@ -1,42 +0,0 @@
-# lock.m4 serial 13 (gettext-0.18.2)
-dnl Copyright (C) 2005-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([gl_LOCK],
-[
-  AC_REQUIRE([gl_THREADLIB])
-  if test "$gl_threads_api" = posix; then
-    # OSF/1 4.0 and Mac OS X 10.1 lack the pthread_rwlock_t type and the
-    # pthread_rwlock_* functions.
-    AC_CHECK_TYPE([pthread_rwlock_t],
-      [AC_DEFINE([HAVE_PTHREAD_RWLOCK], [1],
-         [Define if the POSIX multithreading library has read/write locks.])],
-      [],
-      [#include <pthread.h>])
-    # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
-    AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM(
-        [[#include <pthread.h>]],
-        [[
-#if __FreeBSD__ == 4
-error "No, in FreeBSD 4.0 recursive mutexes actually don't work."
-#elif (defined __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ \
-       && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
-error "No, in Mac OS X < 10.7 recursive mutexes actually don't work."
-#else
-int x = (int)PTHREAD_MUTEX_RECURSIVE;
-return !x;
-#endif
-        ]])],
-      [AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE], [1],
-         [Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE.])])
-  fi
-  gl_PREREQ_LOCK
-])
-
-# Prerequisites of lib/glthread/lock.c.
-AC_DEFUN([gl_PREREQ_LOCK], [:])
diff --git a/m4/longdouble.m4 b/m4/longdouble.m4
@@ -1,31 +0,0 @@
-# longdouble.m4 serial 2 (gettext-0.15)
-dnl Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-dnl Test whether the compiler supports the 'long double' type.
-dnl Prerequisite: AC_PROG_CC
-
-dnl This file is only needed in autoconf <= 2.59.  Newer versions of autoconf
-dnl have a macro AC_TYPE_LONG_DOUBLE with identical semantics.
-
-AC_DEFUN([gt_TYPE_LONGDOUBLE],
-[
-  AC_CACHE_CHECK([for long double], gt_cv_c_long_double,
-    [if test "$GCC" = yes; then
-       gt_cv_c_long_double=yes
-     else
-       AC_TRY_COMPILE([
-         /* The Stardent Vistra knows sizeof(long double), but does not support it.  */
-         long double foo = 0.0;
-         /* On Ultrix 4.3 cc, long double is 4 and double is 8.  */
-         int array [2*(sizeof(long double) >= sizeof(double)) - 1];
-         ], ,
-         gt_cv_c_long_double=yes, gt_cv_c_long_double=no)
-     fi])
-  if test $gt_cv_c_long_double = yes; then
-    AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.])
-  fi
-])
diff --git a/m4/longlong.m4 b/m4/longlong.m4
@@ -1,113 +0,0 @@
-# longlong.m4 serial 17
-dnl Copyright (C) 1999-2007, 2009-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Paul Eggert.
-
-# Define HAVE_LONG_LONG_INT if 'long long int' works.
-# This fixes a bug in Autoconf 2.61, and can be faster
-# than what's in Autoconf 2.62 through 2.68.
-
-# Note: If the type 'long long int' exists but is only 32 bits large
-# (as on some very old compilers), HAVE_LONG_LONG_INT will not be
-# defined. In this case you can treat 'long long int' like 'long int'.
-
-AC_DEFUN([AC_TYPE_LONG_LONG_INT],
-[
-  AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
-  AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int],
-     [ac_cv_type_long_long_int=yes
-      if test "x${ac_cv_prog_cc_c99-no}" = xno; then
-        ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int
-        if test $ac_cv_type_long_long_int = yes; then
-          dnl Catch a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004.
-          dnl If cross compiling, assume the bug is not important, since
-          dnl nobody cross compiles for this platform as far as we know.
-          AC_RUN_IFELSE(
-            [AC_LANG_PROGRAM(
-               [[@%:@include <limits.h>
-                 @%:@ifndef LLONG_MAX
-                 @%:@ define HALF \
-                          (1LL << (sizeof (long long int) * CHAR_BIT - 2))
-                 @%:@ define LLONG_MAX (HALF - 1 + HALF)
-                 @%:@endif]],
-               [[long long int n = 1;
-                 int i;
-                 for (i = 0; ; i++)
-                   {
-                     long long int m = n << i;
-                     if (m >> i != n)
-                       return 1;
-                     if (LLONG_MAX / 2 < m)
-                       break;
-                   }
-                 return 0;]])],
-            [],
-            [ac_cv_type_long_long_int=no],
-            [:])
-        fi
-      fi])
-  if test $ac_cv_type_long_long_int = yes; then
-    AC_DEFINE([HAVE_LONG_LONG_INT], [1],
-      [Define to 1 if the system has the type 'long long int'.])
-  fi
-])
-
-# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works.
-# This fixes a bug in Autoconf 2.61, and can be faster
-# than what's in Autoconf 2.62 through 2.68.
-
-# Note: If the type 'unsigned long long int' exists but is only 32 bits
-# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT
-# will not be defined. In this case you can treat 'unsigned long long int'
-# like 'unsigned long int'.
-
-AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT],
-[
-  AC_CACHE_CHECK([for unsigned long long int],
-    [ac_cv_type_unsigned_long_long_int],
-    [ac_cv_type_unsigned_long_long_int=yes
-     if test "x${ac_cv_prog_cc_c99-no}" = xno; then
-       AC_LINK_IFELSE(
-         [_AC_TYPE_LONG_LONG_SNIPPET],
-         [],
-         [ac_cv_type_unsigned_long_long_int=no])
-     fi])
-  if test $ac_cv_type_unsigned_long_long_int = yes; then
-    AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], [1],
-      [Define to 1 if the system has the type 'unsigned long long int'.])
-  fi
-])
-
-# Expands to a C program that can be used to test for simultaneous support
-# of 'long long' and 'unsigned long long'. We don't want to say that
-# 'long long' is available if 'unsigned long long' is not, or vice versa,
-# because too many programs rely on the symmetry between signed and unsigned
-# integer types (excluding 'bool').
-AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET],
-[
-  AC_LANG_PROGRAM(
-    [[/* For now, do not test the preprocessor; as of 2007 there are too many
-         implementations with broken preprocessors.  Perhaps this can
-         be revisited in 2012.  In the meantime, code should not expect
-         #if to work with literals wider than 32 bits.  */
-      /* Test literals.  */
-      long long int ll = 9223372036854775807ll;
-      long long int nll = -9223372036854775807LL;
-      unsigned long long int ull = 18446744073709551615ULL;
-      /* Test constant expressions.   */
-      typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
-                     ? 1 : -1)];
-      typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
-                     ? 1 : -1)];
-      int i = 63;]],
-    [[/* Test availability of runtime routines for shift and division.  */
-      long long int llmax = 9223372036854775807ll;
-      unsigned long long int ullmax = 18446744073709551615ull;
-      return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
-              | (llmax / ll) | (llmax % ll)
-              | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
-              | (ullmax / ull) | (ullmax % ull));]])
-])
diff --git a/m4/nls.m4 b/m4/nls.m4
@@ -1,32 +0,0 @@
-# nls.m4 serial 6 (gettext-0.20.2)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019-2020 Free
-dnl Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Lesser General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Lesser General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ([2.50])
-
-AC_DEFUN([AM_NLS],
-[
-  AC_MSG_CHECKING([whether NLS is requested])
-  dnl Default is enabled NLS
-  AC_ARG_ENABLE([nls],
-    [  --disable-nls           do not use Native Language Support],
-    USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT([$USE_NLS])
-  AC_SUBST([USE_NLS])
-])
diff --git a/m4/perl.m4 b/m4/perl.m4
@@ -1,48 +0,0 @@
-# serial 9
-
-dnl From Jim Meyering.
-dnl Find a new-enough version of Perl.
-
-# Copyright (C) 1998-2001, 2003-2004, 2007, 2009-2018 Free Software Foundation,
-# Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# GNUnet e.V. comment of origin: gnulib
-
-AC_DEFUN([gl_PERL],
-[
-  dnl FIXME: don't hard-code 5.005
-  AC_MSG_CHECKING([for perl5.005 or newer])
-  if test "${PERL+set}" = set; then
-    # 'PERL' is set in the user's environment.
-    candidate_perl_names="$PERL"
-    perl_specified=yes
-  else
-    candidate_perl_names='perl perl5'
-    perl_specified=no
-  fi
-
-  found=no
-  AC_SUBST([PERL])
-  PERL="$am_missing_run perl"
-  for perl in $candidate_perl_names; do
-    # Run test in a subshell; some versions of sh will print an error if
-    # an executable is not found, even if stderr is redirected.
-    if ( $perl -e 'require 5.005; use File::Compare' ) > /dev/null 2>&1; then
-      PERL=$perl
-      found=yes
-      break
-    fi
-  done
-
-  AC_MSG_RESULT([$found])
-  test $found = no && AC_MSG_WARN([
-WARNING: You don't seem to have perl5.005 or newer installed, or you lack
-         a usable version of the Perl File::Compare module.  As a result,
-         you may be unable to run a few tests or to regenerate certain
-         files if you modify the sources from which they are derived.
-] )
-])
diff --git a/m4/pkg.m4 b/m4/pkg.m4
@@ -1,275 +0,0 @@
-dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-dnl serial 11 (pkg-config-0.29)
-dnl
-dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful, but
-dnl WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-dnl 02111-1307, USA.
-dnl
-dnl As a special exception to the GNU General Public License, if you
-dnl distribute this file as part of a program that contains a
-dnl configuration script generated by Autoconf, you may include it under
-dnl the same distribution terms that you use for the rest of that
-dnl program.
-
-dnl PKG_PREREQ(MIN-VERSION)
-dnl -----------------------
-dnl Since: 0.29
-dnl
-dnl Verify that the version of the pkg-config macros are at least
-dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
-dnl installed version of pkg-config, this checks the developer's version
-dnl of pkg.m4 when generating configure.
-dnl
-dnl To ensure that this macro is defined, also add:
-dnl m4_ifndef([PKG_PREREQ],
-dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
-dnl
-dnl See the "Since" comment for each macro you use to see what version
-dnl of the macros you require.
-m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29])
-m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
-    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
-])dnl PKG_PREREQ
-
-dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
-dnl ----------------------------------
-dnl Since: 0.16
-dnl
-dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
-dnl first found in the path. Checks that the version of pkg-config found
-dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
-dnl used since that's the first version where most current features of
-dnl pkg-config existed.
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-fi[]dnl
-])dnl PKG_PROG_PKG_CONFIG
-
-dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-dnl -------------------------------------------------------------------
-dnl Since: 0.18
-dnl
-dnl Check to see whether a particular set of modules exists. Similar to
-dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
-dnl
-dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-dnl only at the first occurrence in configure.ac, so if the first place
-dnl it's called might be skipped (such as if it is within an "if", you
-dnl have to call PKG_CHECK_EXISTS manually
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_default([$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-dnl ---------------------------------------------
-dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
-dnl pkg_failed based on the result.
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
-    pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ],
-		     [pkg_failed=yes])
- else
-    pkg_failed=untried
-fi[]dnl
-])dnl _PKG_CONFIG
-
-dnl _PKG_SHORT_ERRORS_SUPPORTED
-dnl ---------------------------
-dnl Internal check to see if pkg-config supports short errors.
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])dnl _PKG_SHORT_ERRORS_SUPPORTED
-
-
-dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-dnl   [ACTION-IF-NOT-FOUND])
-dnl --------------------------------------------------------------
-dnl Since: 0.4.0
-dnl
-dnl Note that if there is a possibility the first call to
-dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
-dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-   	AC_MSG_RESULT([no])
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT])[]dnl
-        ])
-elif test $pkg_failed = untried; then
-     	AC_MSG_RESULT([no])
-	m4_default([$4], [AC_MSG_FAILURE(
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
-        ])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	$3
-fi[]dnl
-])dnl PKG_CHECK_MODULES
-
-
-dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-dnl   [ACTION-IF-NOT-FOUND])
-dnl ---------------------------------------------------------------------
-dnl Since: 0.29
-dnl
-dnl Checks for existence of MODULES and gathers its build flags with
-dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
-dnl and VARIABLE-PREFIX_LIBS from --libs.
-dnl
-dnl Note that if there is a possibility the first call to
-dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
-dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
-dnl configure.ac.
-AC_DEFUN([PKG_CHECK_MODULES_STATIC],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-_save_PKG_CONFIG=$PKG_CONFIG
-PKG_CONFIG="$PKG_CONFIG --static"
-PKG_CHECK_MODULES($@)
-PKG_CONFIG=$_save_PKG_CONFIG[]dnl
-])dnl PKG_CHECK_MODULES_STATIC
-
-
-dnl PKG_INSTALLDIR([DIRECTORY])
-dnl -------------------------
-dnl Since: 0.27
-dnl
-dnl Substitutes the variable pkgconfigdir as the location where a module
-dnl should install pkg-config .pc files. By default the directory is
-dnl $libdir/pkgconfig, but the default can be changed by passing
-dnl DIRECTORY. The user can override through the --with-pkgconfigdir
-dnl parameter.
-AC_DEFUN([PKG_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
-m4_pushdef([pkg_description],
-    [pkg-config installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([pkgconfigdir],
-    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
-    [with_pkgconfigdir=]pkg_default)
-AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-])dnl PKG_INSTALLDIR
-
-
-dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
-dnl --------------------------------
-dnl Since: 0.27
-dnl
-dnl Substitutes the variable noarch_pkgconfigdir as the location where a
-dnl module should install arch-independent pkg-config .pc files. By
-dnl default the directory is $datadir/pkgconfig, but the default can be
-dnl changed by passing DIRECTORY. The user can override through the
-dnl --with-noarch-pkgconfigdir parameter.
-AC_DEFUN([PKG_NOARCH_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
-m4_pushdef([pkg_description],
-    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([noarch-pkgconfigdir],
-    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
-    [with_noarch_pkgconfigdir=]pkg_default)
-AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-])dnl PKG_NOARCH_INSTALLDIR
-
-
-dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-dnl -------------------------------------------
-dnl Since: 0.28
-dnl
-dnl Retrieves the value of the pkg-config variable for the given module.
-AC_DEFUN([PKG_CHECK_VAR],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
-
-_PKG_CONFIG([$1], [variable="][$3]["], [$2])
-AS_VAR_COPY([$1], [pkg_cv_][$1])
-
-AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])dnl PKG_CHECK_VAR
diff --git a/m4/po.m4 b/m4/po.m4
@@ -1,450 +0,0 @@
-# po.m4 serial 31 (gettext-0.20.2)
-dnl Copyright (C) 1995-2014, 2016, 2018-2020 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Lesser General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Lesser General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ([2.60])
-
-dnl Checks for all prerequisites of the po subdirectory.
-AC_DEFUN([AM_PO_SUBDIRS],
-[
-  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-  AC_REQUIRE([AC_PROG_SED])dnl
-  AC_REQUIRE([AM_NLS])dnl
-
-  dnl Release version of the gettext macros. This is used to ensure that
-  dnl the gettext macros and po/Makefile.in.in are in sync.
-  AC_SUBST([GETTEXT_MACRO_VERSION], [0.20])
-
-  dnl Perform the following tests also if --disable-nls has been given,
-  dnl because they are needed for "make dist" to work.
-
-  dnl Search for GNU msgfmt in the PATH.
-  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
-  dnl The second test excludes FreeBSD msgfmt.
-  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-    [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
-     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
-
-  dnl Test whether it is GNU msgfmt >= 0.15.
-changequote(,)dnl
-  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
-    *) GMSGFMT_015=$GMSGFMT ;;
-  esac
-changequote([,])dnl
-  AC_SUBST([GMSGFMT_015])
-
-  dnl Search for GNU xgettext 0.12 or newer in the PATH.
-  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
-  dnl The second test excludes FreeBSD xgettext.
-  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
-     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  dnl Remove leftover from FreeBSD xgettext call.
-  rm -f messages.po
-
-  dnl Test whether it is GNU xgettext >= 0.15.
-changequote(,)dnl
-  case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
-    *) XGETTEXT_015=$XGETTEXT ;;
-  esac
-changequote([,])dnl
-  AC_SUBST([XGETTEXT_015])
-
-  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
-  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
-    [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
-
-  dnl Test whether it is GNU msgmerge >= 0.20.
-  if LC_ALL=C $MSGMERGE --help | grep ' --for-msgfmt ' >/dev/null; then
-    MSGMERGE_FOR_MSGFMT_OPTION='--for-msgfmt'
-  else
-    dnl Test whether it is GNU msgmerge >= 0.12.
-    if LC_ALL=C $MSGMERGE --help | grep ' --no-fuzzy-matching ' >/dev/null; then
-      MSGMERGE_FOR_MSGFMT_OPTION='--no-fuzzy-matching --no-location --quiet'
-    else
-      dnl With these old versions, $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) is
-      dnl slow. But this is not a big problem, as such old gettext versions are
-      dnl hardly in use any more.
-      MSGMERGE_FOR_MSGFMT_OPTION='--no-location --quiet'
-    fi
-  fi
-  AC_SUBST([MSGMERGE_FOR_MSGFMT_OPTION])
-
-  dnl Support for AM_XGETTEXT_OPTION.
-  test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
-  AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
-
-  AC_CONFIG_COMMANDS([po-directories], [[
-    for ac_file in $CONFIG_FILES; do
-      # Support "outfile[:infile[:infile...]]"
-      case "$ac_file" in
-        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-      esac
-      # PO directories have a Makefile.in generated from Makefile.in.in.
-      case "$ac_file" in */Makefile.in)
-        # Adjust a relative srcdir.
-        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
-        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-        # In autoconf-2.13 it is called $ac_given_srcdir.
-        # In autoconf-2.50 it is called $srcdir.
-        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-        case "$ac_given_srcdir" in
-          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-          /*) top_srcdir="$ac_given_srcdir" ;;
-          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-        esac
-        # Treat a directory as a PO directory if and only if it has a
-        # POTFILES.in file. This allows packages to have multiple PO
-        # directories under different names or in different locations.
-        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          gt_tab=`printf '\t'`
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-          POMAKEFILEDEPS="POTFILES.in"
-          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
-          # on $ac_dir but don't depend on user-specified configuration
-          # parameters.
-          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-            # The LINGUAS file contains the set of available languages.
-            if test -n "$OBSOLETE_ALL_LINGUAS"; then
-              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-            fi
-            ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-          else
-            # The set of available languages was given in configure.in.
-            ALL_LINGUAS=$OBSOLETE_ALL_LINGUAS
-          fi
-          # Compute POFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-          # Compute UPDATEPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-          # Compute DUMMYPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-          # Compute GMOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-          case "$ac_given_srcdir" in
-            .) srcdirpre= ;;
-            *) srcdirpre='$(srcdir)/' ;;
-          esac
-          POFILES=
-          UPDATEPOFILES=
-          DUMMYPOFILES=
-          GMOFILES=
-          for lang in $ALL_LINGUAS; do
-            POFILES="$POFILES $srcdirpre$lang.po"
-            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-          done
-          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-          # environment variable.
-          INST_LINGUAS=
-          if test -n "$ALL_LINGUAS"; then
-            for presentlang in $ALL_LINGUAS; do
-              useit=no
-              if test "%UNSET%" != "$LINGUAS"; then
-                desiredlanguages="$LINGUAS"
-              else
-                desiredlanguages="$ALL_LINGUAS"
-              fi
-              for desiredlang in $desiredlanguages; do
-                # Use the presentlang catalog if desiredlang is
-                #   a. equal to presentlang, or
-                #   b. a variant of presentlang (because in this case,
-                #      presentlang can be used as a fallback for messages
-                #      which are not translated in the desiredlang catalog).
-                case "$desiredlang" in
-                  "$presentlang"*) useit=yes;;
-                esac
-              done
-              if test $useit = yes; then
-                INST_LINGUAS="$INST_LINGUAS $presentlang"
-              fi
-            done
-          fi
-          CATALOGS=
-          if test -n "$INST_LINGUAS"; then
-            for lang in $INST_LINGUAS; do
-              CATALOGS="$CATALOGS $lang.gmo"
-            done
-          fi
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-            if test -f "$f"; then
-              case "$f" in
-                *.orig | *.bak | *~) ;;
-                *) cat "$f" >> "$ac_dir/Makefile" ;;
-              esac
-            fi
-          done
-        fi
-        ;;
-      esac
-    done]],
-   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS.
-    OBSOLETE_ALL_LINGUAS="$ALL_LINGUAS"
-    # Capture the value of LINGUAS because we need it to compute CATALOGS.
-    LINGUAS="${LINGUAS-%UNSET%}"
-   ])
-])
-
-dnl Postprocesses a Makefile in a directory containing PO files.
-AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
-[
-  # When this code is run, in config.status, two variables have already been
-  # set:
-  # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
-  # - LINGUAS is the value of the environment variable LINGUAS at configure
-  #   time.
-
-changequote(,)dnl
-  # Adjust a relative srcdir.
-  ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-  ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
-  ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-  # In autoconf-2.13 it is called $ac_given_srcdir.
-  # In autoconf-2.50 it is called $srcdir.
-  test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-  case "$ac_given_srcdir" in
-    .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-    /*) top_srcdir="$ac_given_srcdir" ;;
-    *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  # Find a way to echo strings without interpreting backslash.
-  if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
-    gt_echo='echo'
-  else
-    if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
-      gt_echo='printf %s\n'
-    else
-      echo_func () {
-        cat <<EOT
-$*
-EOT
-      }
-      gt_echo='echo_func'
-    fi
-  fi
-
-  # A sed script that extracts the value of VARIABLE from a Makefile.
-  tab=`printf '\t'`
-  sed_x_variable='
-# Test if the hold space is empty.
-x
-s/P/P/
-x
-ta
-# Yes it was empty. Look if we have the expected variable definition.
-/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
-  # Seen the first line of the variable definition.
-  s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
-  ba
-}
-bd
-:a
-# Here we are processing a line from the variable definition.
-# Remove comment, more precisely replace it with a space.
-s/#.*$/ /
-# See if the line ends in a backslash.
-tb
-:b
-s/\\$//
-# Print the line, without the trailing backslash.
-p
-tc
-# There was no trailing backslash. The end of the variable definition is
-# reached. Clear the hold space.
-s/^.*$//
-x
-bd
-:c
-# A trailing backslash means that the variable definition continues in the
-# next line. Put a nonempty string into the hold space to indicate this.
-s/^.*$/P/
-x
-:d
-'
-changequote([,])dnl
-
-  # Set POTFILES to the value of the Makefile variable POTFILES.
-  sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
-  POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
-  # Compute POTFILES_DEPS as
-  #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-  POTFILES_DEPS=
-  for file in $POTFILES; do
-    POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
-  done
-  POMAKEFILEDEPS=""
-
-  if test -n "$OBSOLETE_ALL_LINGUAS"; then
-    test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-  fi
-  if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-    # The LINGUAS file contains the set of available languages.
-    ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-    POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-  else
-    # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
-    sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
-    ALL_LINGUAS=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
-  fi
-  # Compute POFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-  # Compute UPDATEPOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-  # Compute DUMMYPOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-  # Compute GMOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-  # Compute PROPERTIESFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(DOMAIN)_$(lang).properties)
-  # Compute CLASSFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(DOMAIN)_$(lang).class)
-  # Compute QMFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
-  # Compute MSGFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
-  # Compute RESOURCESDLLFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
-  case "$ac_given_srcdir" in
-    .) srcdirpre= ;;
-    *) srcdirpre='$(srcdir)/' ;;
-  esac
-  POFILES=
-  UPDATEPOFILES=
-  DUMMYPOFILES=
-  GMOFILES=
-  PROPERTIESFILES=
-  CLASSFILES=
-  QMFILES=
-  MSGFILES=
-  RESOURCESDLLFILES=
-  for lang in $ALL_LINGUAS; do
-    POFILES="$POFILES $srcdirpre$lang.po"
-    UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-    DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-    GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-    PROPERTIESFILES="$PROPERTIESFILES \$(srcdir)/\$(DOMAIN)_$lang.properties"
-    CLASSFILES="$CLASSFILES \$(srcdir)/\$(DOMAIN)_$lang.class"
-    QMFILES="$QMFILES $srcdirpre$lang.qm"
-    frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-    MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
-    frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
-    RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
-  done
-  # CATALOGS depends on both $ac_dir and the user's LINGUAS
-  # environment variable.
-  INST_LINGUAS=
-  if test -n "$ALL_LINGUAS"; then
-    for presentlang in $ALL_LINGUAS; do
-      useit=no
-      if test "%UNSET%" != "$LINGUAS"; then
-        desiredlanguages="$LINGUAS"
-      else
-        desiredlanguages="$ALL_LINGUAS"
-      fi
-      for desiredlang in $desiredlanguages; do
-        # Use the presentlang catalog if desiredlang is
-        #   a. equal to presentlang, or
-        #   b. a variant of presentlang (because in this case,
-        #      presentlang can be used as a fallback for messages
-        #      which are not translated in the desiredlang catalog).
-        case "$desiredlang" in
-          "$presentlang"*) useit=yes;;
-        esac
-      done
-      if test $useit = yes; then
-        INST_LINGUAS="$INST_LINGUAS $presentlang"
-      fi
-    done
-  fi
-  CATALOGS=
-  JAVACATALOGS=
-  QTCATALOGS=
-  TCLCATALOGS=
-  CSHARPCATALOGS=
-  if test -n "$INST_LINGUAS"; then
-    for lang in $INST_LINGUAS; do
-      CATALOGS="$CATALOGS $lang.gmo"
-      JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
-      QTCATALOGS="$QTCATALOGS $lang.qm"
-      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-      TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
-      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
-      CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
-    done
-  fi
-
-  sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
-  tab=`printf '\t'`
-  if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
-    # Add dependencies that cannot be formulated as a simple suffix rule.
-    for lang in $ALL_LINGUAS; do
-      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-      cat >> "$ac_file.tmp" <<EOF
-$frobbedlang.msg: $lang.po
-${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
-${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
-    done
-  fi
-  if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
-    # Add dependencies that cannot be formulated as a simple suffix rule.
-    for lang in $ALL_LINGUAS; do
-      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
-      cat >> "$ac_file.tmp" <<EOF
-$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
-${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
-${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
-    done
-  fi
-  if test -n "$POMAKEFILEDEPS"; then
-    cat >> "$ac_file.tmp" <<EOF
-Makefile: $POMAKEFILEDEPS
-EOF
-  fi
-  mv "$ac_file.tmp" "$ac_file"
-])
-
-dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
-AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
-[
-  XGETTEXT_EXTRA_OPTIONS=
-])
-
-dnl Registers an option to be passed to xgettext in the po subdirectory.
-AC_DEFUN([AM_XGETTEXT_OPTION],
-[
-  AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
-  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
-])
diff --git a/m4/printf-posix.m4 b/m4/printf-posix.m4
@@ -1,48 +0,0 @@
-# printf-posix.m4 serial 6 (gettext-0.18.2)
-dnl Copyright (C) 2003, 2007, 2009-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-dnl Test whether the printf() function supports POSIX/XSI format strings with
-dnl positions.
-
-AC_DEFUN([gt_PRINTF_POSIX],
-[
-  AC_REQUIRE([AC_PROG_CC])
-  AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings],
-    gt_cv_func_printf_posix,
-    [
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
-#include <stdio.h>
-#include <string.h>
-/* The string "%2$d %1$d", with dollar characters protected from the shell's
-   dollar expansion (possibly an autoconf bug).  */
-static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
-static char buf[100];
-int main ()
-{
-  sprintf (buf, format, 33, 55);
-  return (strcmp (buf, "55 33") != 0);
-}]])],
-        [gt_cv_func_printf_posix=yes],
-        [gt_cv_func_printf_posix=no],
-        [
-          AC_EGREP_CPP([notposix], [
-#if defined __NetBSD__ || defined __BEOS__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
-  notposix
-#endif
-            ],
-            [gt_cv_func_printf_posix="guessing no"],
-            [gt_cv_func_printf_posix="guessing yes"])
-        ])
-    ])
-  case $gt_cv_func_printf_posix in
-    *yes)
-      AC_DEFINE([HAVE_POSIX_PRINTF], [1],
-        [Define if your printf() function supports format strings with positions.])
-      ;;
-  esac
-])
diff --git a/m4/progtest.m4 b/m4/progtest.m4
@@ -1,91 +0,0 @@
-# progtest.m4 serial 8 (gettext-0.20.2)
-dnl Copyright (C) 1996-2003, 2005, 2008-2020 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Lesser General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Lesser General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-AC_PREREQ([2.50])
-
-# Search path for a program which passes the given test.
-
-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST],
-[
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL([ac_cv_path_$1],
-[case "[$]$1" in
-  [[\\/]]* | ?:[[\\/]]*)
-    ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in ifelse([$5], , $PATH, [$5]); do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
-          if [$3]; then
-            ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-    ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-  AC_MSG_RESULT([$][$1])
-else
-  AC_MSG_RESULT([no])
-fi
-AC_SUBST([$1])dnl
-])
diff --git a/m4/signed.m4 b/m4/signed.m4
@@ -1,19 +0,0 @@
-# signed.m4 serial 1 (gettext-0.10.40)
-dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([bh_C_SIGNED],
-[
-  AC_CACHE_CHECK([for signed], bh_cv_c_signed,
-   [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)])
-  if test $bh_cv_c_signed = no; then
-    AC_DEFINE(signed, ,
-              [Define to empty if the C compiler doesn't support this keyword.])
-  fi
-])
diff --git a/m4/size_max.m4 b/m4/size_max.m4
@@ -1,79 +0,0 @@
-# size_max.m4 serial 10
-dnl Copyright (C) 2003, 2005-2006, 2008-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([gl_SIZE_MAX],
-[
-  AC_CHECK_HEADERS([stdint.h])
-  dnl First test whether the system already has SIZE_MAX.
-  AC_CACHE_CHECK([for SIZE_MAX], [gl_cv_size_max], [
-    gl_cv_size_max=
-    AC_EGREP_CPP([Found it], [
-#include <limits.h>
-#if HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef SIZE_MAX
-Found it
-#endif
-], [gl_cv_size_max=yes])
-    if test -z "$gl_cv_size_max"; then
-      dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
-      dnl than the type 'unsigned long'. Try hard to find a definition that can
-      dnl be used in a preprocessor #if, i.e. doesn't contain a cast.
-      AC_COMPUTE_INT([size_t_bits_minus_1], [sizeof (size_t) * CHAR_BIT - 1],
-        [#include <stddef.h>
-#include <limits.h>], [size_t_bits_minus_1=])
-      AC_COMPUTE_INT([fits_in_uint], [sizeof (size_t) <= sizeof (unsigned int)],
-        [#include <stddef.h>], [fits_in_uint=])
-      if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then
-        if test $fits_in_uint = 1; then
-          dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
-          dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
-          AC_COMPILE_IFELSE(
-            [AC_LANG_PROGRAM(
-               [[#include <stddef.h>
-                 extern size_t foo;
-                 extern unsigned long foo;
-               ]],
-               [[]])],
-            [fits_in_uint=0])
-        fi
-        dnl We cannot use 'expr' to simplify this expression, because 'expr'
-        dnl works only with 'long' integers in the host environment, while we
-        dnl might be cross-compiling from a 32-bit platform to a 64-bit platform.
-        if test $fits_in_uint = 1; then
-          gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)"
-        else
-          gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)"
-        fi
-      else
-        dnl Shouldn't happen, but who knows...
-        gl_cv_size_max='((size_t)~(size_t)0)'
-      fi
-    fi
-  ])
-  if test "$gl_cv_size_max" != yes; then
-    AC_DEFINE_UNQUOTED([SIZE_MAX], [$gl_cv_size_max],
-      [Define as the maximum value of type 'size_t', if the system doesn't define it.])
-  fi
-  dnl Don't redefine SIZE_MAX in config.h if config.h is re-included after
-  dnl <stdint.h>. Remember that the #undef in AH_VERBATIM gets replaced with
-  dnl #define by AC_DEFINE_UNQUOTED.
-  AH_VERBATIM([SIZE_MAX],
-[/* Define as the maximum value of type 'size_t', if the system doesn't define
-   it. */
-#ifndef SIZE_MAX
-# undef SIZE_MAX
-#endif])
-])
-
-dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in.
-dnl Remove this when we can assume autoconf >= 2.61.
-m4_ifdef([AC_COMPUTE_INT], [], [
-  AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])])
-])
diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4
@@ -1,27 +0,0 @@
-# stdint_h.m4 serial 9
-dnl Copyright (C) 1997-2004, 2006, 2008-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Paul Eggert.
-
-# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
-# doesn't clash with <sys/types.h>, and declares uintmax_t.
-
-AC_DEFUN([gl_AC_HEADER_STDINT_H],
-[
-  AC_CACHE_CHECK([for stdint.h], [gl_cv_header_stdint_h],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <sys/types.h>
-            #include <stdint.h>]],
-          [[uintmax_t i = (uintmax_t) -1; return !i;]])],
-       [gl_cv_header_stdint_h=yes],
-       [gl_cv_header_stdint_h=no])])
-  if test $gl_cv_header_stdint_h = yes; then
-    AC_DEFINE_UNQUOTED([HAVE_STDINT_H_WITH_UINTMAX], [1],
-      [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
-       and declares uintmax_t. ])
-  fi
-])
diff --git a/m4/threadlib.m4 b/m4/threadlib.m4
@@ -1,389 +0,0 @@
-# threadlib.m4 serial 11 (gettext-0.18.2)
-dnl Copyright (C) 2005-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-dnl gl_THREADLIB
-dnl ------------
-dnl Tests for a multithreading library to be used.
-dnl If the configure.ac contains a definition of the gl_THREADLIB_DEFAULT_NO
-dnl (it must be placed before the invocation of gl_THREADLIB_EARLY!), then the
-dnl default is 'no', otherwise it is system dependent. In both cases, the user
-dnl can change the choice through the options --enable-threads=choice or
-dnl --disable-threads.
-dnl Defines at most one of the macros USE_POSIX_THREADS, USE_SOLARIS_THREADS,
-dnl USE_PTH_THREADS, USE_WINDOWS_THREADS
-dnl Sets the variables LIBTHREAD and LTLIBTHREAD to the linker options for use
-dnl in a Makefile (LIBTHREAD for use without libtool, LTLIBTHREAD for use with
-dnl libtool).
-dnl Sets the variables LIBMULTITHREAD and LTLIBMULTITHREAD similarly, for
-dnl programs that really need multithread functionality. The difference
-dnl between LIBTHREAD and LIBMULTITHREAD is that on platforms supporting weak
-dnl symbols, typically LIBTHREAD is empty whereas LIBMULTITHREAD is not.
-dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for
-dnl multithread-safe programs.
-
-AC_DEFUN([gl_THREADLIB_EARLY],
-[
-  AC_REQUIRE([gl_THREADLIB_EARLY_BODY])
-])
-
-dnl The guts of gl_THREADLIB_EARLY. Needs to be expanded only once.
-
-AC_DEFUN([gl_THREADLIB_EARLY_BODY],
-[
-  dnl Ordering constraints: This macro modifies CPPFLAGS in a way that
-  dnl influences the result of the autoconf tests that test for *_unlocked
-  dnl declarations, on AIX 5 at least. Therefore it must come early.
-  AC_BEFORE([$0], [gl_FUNC_GLIBC_UNLOCKED_IO])dnl
-  AC_BEFORE([$0], [gl_ARGP])dnl
-
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  dnl _GNU_SOURCE is needed for pthread_rwlock_t on glibc systems.
-  dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes
-  dnl AC_GNU_SOURCE.
-  m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
-    [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])],
-    [AC_REQUIRE([AC_GNU_SOURCE])])
-  dnl Check for multithreading.
-  m4_ifdef([gl_THREADLIB_DEFAULT_NO],
-    [m4_divert_text([DEFAULTS], [gl_use_threads_default=no])],
-    [m4_divert_text([DEFAULTS], [gl_use_threads_default=])])
-  AC_ARG_ENABLE([threads],
-AS_HELP_STRING([--enable-threads={posix|solaris|pth|windows}], [specify multithreading API])m4_ifdef([gl_THREADLIB_DEFAULT_NO], [], [
-AS_HELP_STRING([--disable-threads], [build without multithread safety])]),
-    [gl_use_threads=$enableval],
-    [if test -n "$gl_use_threads_default"; then
-       gl_use_threads="$gl_use_threads_default"
-     else
-changequote(,)dnl
-       case "$host_os" in
-         dnl Disable multithreading by default on OSF/1, because it interferes
-         dnl with fork()/exec(): When msgexec is linked with -lpthread, its
-         dnl child process gets an endless segmentation fault inside execvp().
-         dnl Disable multithreading by default on Cygwin 1.5.x, because it has
-         dnl bugs that lead to endless loops or crashes. See
-         dnl <http://cygwin.com/ml/cygwin/2009-08/msg00283.html>.
-         osf*) gl_use_threads=no ;;
-         cygwin*)
-               case `uname -r` in
-                 1.[0-5].*) gl_use_threads=no ;;
-                 *)         gl_use_threads=yes ;;
-               esac
-               ;;
-         *)    gl_use_threads=yes ;;
-       esac
-changequote([,])dnl
-     fi
-    ])
-  if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
-    # For using <pthread.h>:
-    case "$host_os" in
-      osf*)
-        # On OSF/1, the compiler needs the flag -D_REENTRANT so that it
-        # groks <pthread.h>. cc also understands the flag -pthread, but
-        # we don't use it because 1. gcc-2.95 doesn't understand -pthread,
-        # 2. putting a flag into CPPFLAGS that has an effect on the linker
-        # causes the AC_LINK_IFELSE test below to succeed unexpectedly,
-        # leading to wrong values of LIBTHREAD and LTLIBTHREAD.
-        CPPFLAGS="$CPPFLAGS -D_REENTRANT"
-        ;;
-    esac
-    # Some systems optimize for single-threaded programs by default, and
-    # need special flags to disable these optimizations. For example, the
-    # definition of 'errno' in <errno.h>.
-    case "$host_os" in
-      aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;;
-      solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;;
-    esac
-  fi
-])
-
-dnl The guts of gl_THREADLIB. Needs to be expanded only once.
-
-AC_DEFUN([gl_THREADLIB_BODY],
-[
-  AC_REQUIRE([gl_THREADLIB_EARLY_BODY])
-  gl_threads_api=none
-  LIBTHREAD=
-  LTLIBTHREAD=
-  LIBMULTITHREAD=
-  LTLIBMULTITHREAD=
-  if test "$gl_use_threads" != no; then
-    dnl Check whether the compiler and linker support weak declarations.
-    AC_CACHE_CHECK([whether imported symbols can be declared weak],
-      [gl_cv_have_weak],
-      [gl_cv_have_weak=no
-       dnl First, test whether the compiler accepts it syntactically.
-       AC_LINK_IFELSE(
-         [AC_LANG_PROGRAM(
-            [[extern void xyzzy ();
-#pragma weak xyzzy]],
-            [[xyzzy();]])],
-         [gl_cv_have_weak=maybe])
-       if test $gl_cv_have_weak = maybe; then
-         dnl Second, test whether it actually works. On Cygwin 1.7.2, with
-         dnl gcc 4.3, symbols declared weak always evaluate to the address 0.
-         AC_RUN_IFELSE(
-           [AC_LANG_SOURCE([[
-#include <stdio.h>
-#pragma weak fputs
-int main ()
-{
-  return (fputs == NULL);
-}]])],
-           [gl_cv_have_weak=yes],
-           [gl_cv_have_weak=no],
-           [dnl When cross-compiling, assume that only ELF platforms support
-            dnl weak symbols.
-            AC_EGREP_CPP([Extensible Linking Format],
-              [#ifdef __ELF__
-               Extensible Linking Format
-               #endif
-              ],
-              [gl_cv_have_weak="guessing yes"],
-              [gl_cv_have_weak="guessing no"])
-           ])
-       fi
-      ])
-    if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
-      # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that
-      # it groks <pthread.h>. It's added above, in gl_THREADLIB_EARLY_BODY.
-      AC_CHECK_HEADER([pthread.h],
-        [gl_have_pthread_h=yes], [gl_have_pthread_h=no])
-      if test "$gl_have_pthread_h" = yes; then
-        # Other possible tests:
-        #   -lpthreads (FSU threads, PCthreads)
-        #   -lgthreads
-        gl_have_pthread=
-        # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist
-        # in libc. IRIX 6.5 has the first one in both libc and libpthread, but
-        # the second one only in libpthread, and lock.c needs it.
-        #
-        # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04
-        # needs -pthread for some reason.  See:
-        # http://lists.gnu.org/archive/html/bug-gnulib/2014-09/msg00023.html
-        save_LIBS=$LIBS
-        for gl_pthread in '' '-pthread'; do
-          LIBS="$LIBS $gl_pthread"
-          AC_LINK_IFELSE(
-            [AC_LANG_PROGRAM(
-               [[#include <pthread.h>
-                 pthread_mutex_t m;
-                 pthread_mutexattr_t ma;
-               ]],
-               [[pthread_mutex_lock (&m);
-                 pthread_mutexattr_init (&ma);]])],
-            [gl_have_pthread=yes
-             LIBTHREAD=$gl_pthread LTLIBTHREAD=$gl_pthread
-             LIBMULTITHREAD=$gl_pthread LTLIBMULTITHREAD=$gl_pthread])
-          LIBS=$save_LIBS
-          test -n "$gl_have_pthread" && break
-        done
-
-        # Test for libpthread by looking for pthread_kill. (Not pthread_self,
-        # since it is defined as a macro on OSF/1.)
-        if test -n "$gl_have_pthread" && test -z "$LIBTHREAD"; then
-          # The program links fine without libpthread. But it may actually
-          # need to link with libpthread in order to create multiple threads.
-          AC_CHECK_LIB([pthread], [pthread_kill],
-            [LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
-             # On Solaris and HP-UX, most pthread functions exist also in libc.
-             # Therefore pthread_in_use() needs to actually try to create a
-             # thread: pthread_create from libc will fail, whereas
-             # pthread_create will actually create a thread.
-             case "$host_os" in
-               solaris* | hpux*)
-                 AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1],
-                   [Define if the pthread_in_use() detection is hard.])
-             esac
-            ])
-        elif test -z "$gl_have_pthread"; then
-          # Some library is needed. Try libpthread and libc_r.
-          AC_CHECK_LIB([pthread], [pthread_kill],
-            [gl_have_pthread=yes
-             LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
-             LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread])
-          if test -z "$gl_have_pthread"; then
-            # For FreeBSD 4.
-            AC_CHECK_LIB([c_r], [pthread_kill],
-              [gl_have_pthread=yes
-               LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r
-               LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r])
-          fi
-        fi
-        if test -n "$gl_have_pthread"; then
-          gl_threads_api=posix
-          AC_DEFINE([USE_POSIX_THREADS], [1],
-            [Define if the POSIX multithreading library can be used.])
-          if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
-            if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
-              AC_DEFINE([USE_POSIX_THREADS_WEAK], [1],
-                [Define if references to the POSIX multithreading library should be made weak.])
-              LIBTHREAD=
-              LTLIBTHREAD=
-            fi
-          fi
-        fi
-      fi
-    fi
-    if test -z "$gl_have_pthread"; then
-      if test "$gl_use_threads" = yes || test "$gl_use_threads" = solaris; then
-        gl_have_solaristhread=
-        gl_save_LIBS="$LIBS"
-        LIBS="$LIBS -lthread"
-        AC_LINK_IFELSE(
-          [AC_LANG_PROGRAM(
-             [[
-#include <thread.h>
-#include <synch.h>
-             ]],
-             [[thr_self();]])],
-          [gl_have_solaristhread=yes])
-        LIBS="$gl_save_LIBS"
-        if test -n "$gl_have_solaristhread"; then
-          gl_threads_api=solaris
-          LIBTHREAD=-lthread
-          LTLIBTHREAD=-lthread
-          LIBMULTITHREAD="$LIBTHREAD"
-          LTLIBMULTITHREAD="$LTLIBTHREAD"
-          AC_DEFINE([USE_SOLARIS_THREADS], [1],
-            [Define if the old Solaris multithreading library can be used.])
-          if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
-            AC_DEFINE([USE_SOLARIS_THREADS_WEAK], [1],
-              [Define if references to the old Solaris multithreading library should be made weak.])
-            LIBTHREAD=
-            LTLIBTHREAD=
-          fi
-        fi
-      fi
-    fi
-    if test "$gl_use_threads" = pth; then
-      gl_save_CPPFLAGS="$CPPFLAGS"
-      AC_LIB_LINKFLAGS([pth])
-      gl_have_pth=
-      gl_save_LIBS="$LIBS"
-      LIBS="$LIBS $LIBPTH"
-      AC_LINK_IFELSE(
-        [AC_LANG_PROGRAM([[#include <pth.h>]], [[pth_self();]])],
-        [gl_have_pth=yes])
-      LIBS="$gl_save_LIBS"
-      if test -n "$gl_have_pth"; then
-        gl_threads_api=pth
-        LIBTHREAD="$LIBPTH"
-        LTLIBTHREAD="$LTLIBPTH"
-        LIBMULTITHREAD="$LIBTHREAD"
-        LTLIBMULTITHREAD="$LTLIBTHREAD"
-        AC_DEFINE([USE_PTH_THREADS], [1],
-          [Define if the GNU Pth multithreading library can be used.])
-        if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
-          if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
-            AC_DEFINE([USE_PTH_THREADS_WEAK], [1],
-              [Define if references to the GNU Pth multithreading library should be made weak.])
-            LIBTHREAD=
-            LTLIBTHREAD=
-          fi
-        fi
-      else
-        CPPFLAGS="$gl_save_CPPFLAGS"
-      fi
-    fi
-    if test -z "$gl_have_pthread"; then
-      case "$gl_use_threads" in
-        yes | windows | win32) # The 'win32' is for backward compatibility.
-          if { case "$host_os" in
-                 mingw*) true;;
-                 *) false;;
-               esac
-             }; then
-            gl_threads_api=windows
-            AC_DEFINE([USE_WINDOWS_THREADS], [1],
-              [Define if the native Windows multithreading API can be used.])
-          fi
-          ;;
-      esac
-    fi
-  fi
-  AC_MSG_CHECKING([for multithread API to use])
-  AC_MSG_RESULT([$gl_threads_api])
-  AC_SUBST([LIBTHREAD])
-  AC_SUBST([LTLIBTHREAD])
-  AC_SUBST([LIBMULTITHREAD])
-  AC_SUBST([LTLIBMULTITHREAD])
-])
-
-AC_DEFUN([gl_THREADLIB],
-[
-  AC_REQUIRE([gl_THREADLIB_EARLY])
-  AC_REQUIRE([gl_THREADLIB_BODY])
-])
-
-
-dnl gl_DISABLE_THREADS
-dnl ------------------
-dnl Sets the gl_THREADLIB default so that threads are not used by default.
-dnl The user can still override it at installation time, by using the
-dnl configure option '--enable-threads'.
-
-AC_DEFUN([gl_DISABLE_THREADS], [
-  m4_divert_text([INIT_PREPARE], [gl_use_threads_default=no])
-])
-
-
-dnl Survey of platforms:
-dnl
-dnl Platform           Available  Compiler    Supports   test-lock
-dnl                    flavours   option      weak       result
-dnl ---------------    ---------  ---------   --------   ---------
-dnl Linux 2.4/glibc    posix      -lpthread       Y      OK
-dnl
-dnl GNU Hurd/glibc     posix
-dnl
-dnl Ubuntu 14.04       posix      -pthread        Y      OK
-dnl
-dnl FreeBSD 5.3        posix      -lc_r           Y
-dnl                    posix      -lkse ?         Y
-dnl                    posix      -lpthread ?     Y
-dnl                    posix      -lthr           Y
-dnl
-dnl FreeBSD 5.2        posix      -lc_r           Y
-dnl                    posix      -lkse           Y
-dnl                    posix      -lthr           Y
-dnl
-dnl FreeBSD 4.0,4.10   posix      -lc_r           Y      OK
-dnl
-dnl NetBSD 1.6         --
-dnl
-dnl OpenBSD 3.4        posix      -lpthread       Y      OK
-dnl
-dnl Mac OS X 10.[123]  posix      -lpthread       Y      OK
-dnl
-dnl Solaris 7,8,9      posix      -lpthread       Y      Sol 7,8: 0.0; Sol 9: OK
-dnl                    solaris    -lthread        Y      Sol 7,8: 0.0; Sol 9: OK
-dnl
-dnl HP-UX 11           posix      -lpthread       N (cc) OK
-dnl                                               Y (gcc)
-dnl
-dnl IRIX 6.5           posix      -lpthread       Y      0.5
-dnl
-dnl AIX 4.3,5.1        posix      -lpthread       N      AIX 4: 0.5; AIX 5: OK
-dnl
-dnl OSF/1 4.0,5.1      posix      -pthread (cc)   N      OK
-dnl                               -lpthread (gcc) Y
-dnl
-dnl Cygwin             posix      -lpthread       Y      OK
-dnl
-dnl Any of the above   pth        -lpth                  0.0
-dnl
-dnl Mingw              windows                    N      OK
-dnl
-dnl BeOS 5             --
-dnl
-dnl The test-lock result shows what happens if in test-lock.c EXPLICIT_YIELD is
-dnl turned off:
-dnl   OK if all three tests terminate OK,
-dnl   0.5 if the first test terminates OK but the second one loops endlessly,
-dnl   0.0 if the first test already loops endlessly.
diff --git a/m4/uintmax_t.m4 b/m4/uintmax_t.m4
@@ -1,30 +0,0 @@
-# uintmax_t.m4 serial 12
-dnl Copyright (C) 1997-2004, 2007-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Paul Eggert.
-
-AC_PREREQ([2.13])
-
-# Define uintmax_t to 'unsigned long' or 'unsigned long long'
-# if it is not already defined in <stdint.h> or <inttypes.h>.
-
-AC_DEFUN([gl_AC_TYPE_UINTMAX_T],
-[
-  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
-  if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
-    AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
-    test $ac_cv_type_unsigned_long_long_int = yes \
-      && ac_type='unsigned long long' \
-      || ac_type='unsigned long'
-    AC_DEFINE_UNQUOTED([uintmax_t], [$ac_type],
-      [Define to unsigned long or unsigned long long
-       if <stdint.h> and <inttypes.h> don't define.])
-  else
-    AC_DEFINE([HAVE_UINTMAX_T], [1],
-      [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.])
-  fi
-])
diff --git a/m4/ulonglong.m4 b/m4/ulonglong.m4
@@ -1,48 +0,0 @@
-# ulonglong.m4 serial 6
-dnl Copyright (C) 1999-2006 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Paul Eggert.
-
-# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works.
-# This fixes a bug in Autoconf 2.60, but can be removed once we
-# assume 2.61 everywhere.
-
-# Note: If the type 'unsigned long long int' exists but is only 32 bits
-# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT
-# will not be defined. In this case you can treat 'unsigned long long int'
-# like 'unsigned long int'.
-
-AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT],
-[
-  AC_CACHE_CHECK([for unsigned long long int],
-    [ac_cv_type_unsigned_long_long_int],
-    [AC_LINK_IFELSE(
-       [AC_LANG_PROGRAM(
-	  [[unsigned long long int ull = 18446744073709551615ULL;
-	    typedef int a[(18446744073709551615ULL <= (unsigned long long int) -1
-			   ? 1 : -1)];
-	   int i = 63;]],
-	  [[unsigned long long int ullmax = 18446744073709551615ull;
-	    return (ull << 63 | ull >> 63 | ull << i | ull >> i
-		    | ullmax / ull | ullmax % ull);]])],
-       [ac_cv_type_unsigned_long_long_int=yes],
-       [ac_cv_type_unsigned_long_long_int=no])])
-  if test $ac_cv_type_unsigned_long_long_int = yes; then
-    AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], 1,
-      [Define to 1 if the system has the type `unsigned long long int'.])
-  fi
-])
-
-# This macro is obsolescent and should go away soon.
-AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG],
-[
-  AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
-  ac_cv_type_unsigned_long_long=$ac_cv_type_unsigned_long_long_int
-  if test $ac_cv_type_unsigned_long_long = yes; then
-    AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
-      [Define if you have the 'unsigned long long' type.])
-  fi
-])
diff --git a/m4/visibility.m4 b/m4/visibility.m4
@@ -1,77 +0,0 @@
-# visibility.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2005, 2008, 2010-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-dnl Tests whether the compiler supports the command-line option
-dnl -fvisibility=hidden and the function and variable attributes
-dnl __attribute__((__visibility__("hidden"))) and
-dnl __attribute__((__visibility__("default"))).
-dnl Does *not* test for __visibility__("protected") - which has tricky
-dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
-dnl Mac OS X.
-dnl Does *not* test for __visibility__("internal") - which has processor
-dnl dependent semantics.
-dnl Does *not* test for #pragma GCC visibility push(hidden) - which is
-dnl "really only recommended for legacy code".
-dnl Set the variable CFLAG_VISIBILITY.
-dnl Defines and sets the variable HAVE_VISIBILITY.
-
-AC_DEFUN([gl_VISIBILITY],
-[
-  AC_REQUIRE([AC_PROG_CC])
-  CFLAG_VISIBILITY=
-  HAVE_VISIBILITY=0
-  if test -n "$GCC"; then
-    dnl First, check whether -Werror can be added to the command line, or
-    dnl whether it leads to an error because of some other option that the
-    dnl user has put into $CC $CFLAGS $CPPFLAGS.
-    AC_MSG_CHECKING([whether the -Werror option is usable])
-    AC_CACHE_VAL([gl_cv_cc_vis_werror], [
-      gl_save_CFLAGS="$CFLAGS"
-      CFLAGS="$CFLAGS -Werror"
-      AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM([[]], [[]])],
-        [gl_cv_cc_vis_werror=yes],
-        [gl_cv_cc_vis_werror=no])
-      CFLAGS="$gl_save_CFLAGS"])
-    AC_MSG_RESULT([$gl_cv_cc_vis_werror])
-    dnl Now check whether visibility declarations are supported.
-    AC_MSG_CHECKING([for simple visibility declarations])
-    AC_CACHE_VAL([gl_cv_cc_visibility], [
-      gl_save_CFLAGS="$CFLAGS"
-      CFLAGS="$CFLAGS -fvisibility=hidden"
-      dnl We use the option -Werror and a function dummyfunc, because on some
-      dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning
-      dnl "visibility attribute not supported in this configuration; ignored"
-      dnl at the first function definition in every compilation unit, and we
-      dnl don't want to use the option in this case.
-      if test $gl_cv_cc_vis_werror = yes; then
-        CFLAGS="$CFLAGS -Werror"
-      fi
-      AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM(
-           [[extern __attribute__((__visibility__("hidden"))) int hiddenvar;
-             extern __attribute__((__visibility__("default"))) int exportedvar;
-             extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
-             extern __attribute__((__visibility__("default"))) int exportedfunc (void);
-             void dummyfunc (void) {}
-           ]],
-           [[]])],
-        [gl_cv_cc_visibility=yes],
-        [gl_cv_cc_visibility=no])
-      CFLAGS="$gl_save_CFLAGS"])
-    AC_MSG_RESULT([$gl_cv_cc_visibility])
-    if test $gl_cv_cc_visibility = yes; then
-      CFLAG_VISIBILITY="-fvisibility=hidden"
-      HAVE_VISIBILITY=1
-    fi
-  fi
-  AC_SUBST([CFLAG_VISIBILITY])
-  AC_SUBST([HAVE_VISIBILITY])
-  AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY],
-    [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.])
-])
diff --git a/m4/xsize.m4 b/m4/xsize.m4
@@ -1,12 +0,0 @@
-# xsize.m4 serial 5
-dnl Copyright (C) 2003-2004, 2008-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_XSIZE],
-[
-  dnl Prerequisites of lib/xsize.h.
-  AC_REQUIRE([gl_SIZE_MAX])
-  AC_CHECK_HEADERS([stdint.h])
-])
diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
@@ -1,79 +0,0 @@
-# This Makefile.am is in the public domain
-pcfiles = \
-       gnunetarm.pc \
-       gnunetblock.pc \
-       gnunetconsensus.pc \
-       gnunetconversation.pc \
-       gnunetcore.pc \
-       gnunetdatacache.pc \
-       gnunetdatastore.pc \
-       gnunetdht.pc \
-       gnunetdns.pc \
-       gnunetfs.pc \
-       gnunetgns.pc \
-       gnunetgnsrecord.pc \
-       gnunethello.pc \
-       gnunetidentity.pc \
-       gnunetjson.pc \
-       gnunetcadet.pc \
-       gnunetmessenger.pc \
-       gnunetmicrophone.pc \
-       gnunetnamestore.pc \
-       gnunetnat.pc \
-       gnunetnse.pc \
-       gnunetreclaim.pc \
-       gnunetregex.pc \
-       gnunetrevocation.pc \
-       gnunetrps.pc \
-       gnunetscalarproduct.pc \
-       gnunetset.pc \
-       gnunetspeaker.pc \
-       gnunetstatistics.pc \
-       gnunettesting.pc \
-       gnunettransport.pc \
-       gnunetutil.pc \
-       gnunetvpn.pc
-
-all-local: $(pcfiles)
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(pcfiles)
-
-EXTRA_DIST = \
-       gnunetarm.pc.in \
-       gnunetblock.pc.in \
-       gnunetconsensus.pc.in \
-       gnunetconversation.pc.in \
-       gnunetcore.pc.in \
-       gnunetdatacache.pc.in \
-       gnunetdatastore.pc.in \
-       gnunetdht.pc.in \
-       gnunetdns.pc.in \
-       gnunetfs.pc.in \
-       gnunetgns.pc.in \
-       gnunetgnsrecord.pc.in \
-       gnunethello.pc.in \
-       gnunetidentity.pc.in \
-       gnunetjson.pc.in \
-       gnunetcadet.pc.in \
-       gnunetmessenger.pc.in \
-       gnunetmicrophone.pc.in \
-       gnunetnamestore.pc.in \
-       gnunetnat.pc.in \
-       gnunetnse.pc.in \
-       gnunetpostgres.pc.in \
-       gnunetreclaim.pc.in \
-       gnunetregex.pc.in \
-       gnunetrevocation.pc.in \
-       gnunetrps.pc.in \
-       gnunetscalarproduct.pc.in \
-       gnunetset.pc.in \
-       gnunetspeaker.pc.in \
-       gnunetstatistics.pc.in \
-       gnunettesting.pc.in \
-       gnunettransport.pc.in \
-       gnunetutil.pc.in \
-       gnunetvpn.pc.in
-
-CLEANFILES = $(pcfiles)
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
@@ -1,39 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
-
-dist_pkgdata_DATA = \
-  netjail/nat_node_test.sh \
-  netjail/getmsg.sh \
-  netjail/netjail_core.sh \
-  netjail/netjail_start.sh \
-  netjail/netjail_exec.sh \
-  netjail/netjail_start_new.sh \
-  netjail/netjail_stop.sh \
-  netjail/netjail_test_master.sh \
-  netjail/topo.sh \
-  testing-ng/block.sh \
-  testing-ng/emu_run.sh
-
-EXTRA_DIST = \
-  get_version.sh \
-	dosubst.awk \
-	gana_update.sh \
-	grephdr.sh \
-	grepsrc.sh \
-	pogen.sh \
-	rename.sh
-
-install-data-hook:
-	chmod o+x '$(DESTDIR)$(pkgdatadir)/nat_node_test.sh'
-	chmod o+x '$(DESTDIR)$(pkgdatadir)/getmsg.sh'
-	chmod +x '$(DESTDIR)$(pkgdatadir)/netjail_core.sh'
-	chmod +x '$(DESTDIR)$(pkgdatadir)/netjail_start.sh'
-	chmod +x '$(DESTDIR)$(pkgdatadir)/netjail_start_new.sh'
-	chmod +x '$(DESTDIR)$(pkgdatadir)/netjail_exec.sh'
-	chmod +x '$(DESTDIR)$(pkgdatadir)/netjail_stop.sh'
-	chmod +x '$(DESTDIR)$(pkgdatadir)/netjail_test_master.sh'
-	chmod +x '$(DESTDIR)$(pkgdatadir)/topo.sh'
-	chmod +x '$(DESTDIR)$(pkgdatadir)/block.sh'
-	chmod o+x '$(DESTDIR)$(pkgdatadir)/emu_run.sh'
-
-## EOF
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,11 +0,0 @@
-# This Makefile.am is in the public domain
-
-
-
-SUBDIRS = \
-  include $(INTLEMU_SUBDIRS) \
-  lib \
-	plugin \
-	service \
-	cli \
-	contrib
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
@@ -1,21 +0,0 @@
-SUBDIRS = \
-	util \
-	arm \
-	statistics \
-	core \
-	hello \
-	nat \
-	nat-auto \
-	nse \
-	datastore \
-	dht \
-	identity \
-	namecache \
-	namestore \
-	revocation \
-	vpn \
-	gns \
-	fs \
-	cadet \
-	reclaim \
-	messenger
diff --git a/src/cli/arm/Makefile.am b/src/cli/arm/Makefile.am
@@ -1,45 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-bin_PROGRAMS = \
- gnunet-arm
-
-gnunet_arm_SOURCES = \
- gnunet-arm.c
-gnunet_arm_LDADD = \
-  $(top_builddir)/src/service/arm/libgnunetarm.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-# FIXME the respective conf file now resides in service/arm/
-#if HAVE_PYTHON
-#check_SCRIPTS = \
-# test_gnunet_arm.py
-#endif
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = $(check_PROGRAMS)  $(check_SCRIPTS)
-endif
-
-#SUFFIXES = .py.in .py
-#.py.in.py:
-#	$(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/scripts/dosubst.awk < $(srcdir)/$< > $@
-#	chmod +x $@
-#
-#test_gnunet_arm.py: test_gnunet_arm.py.in Makefile
-#	$(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/scripts/dosubst.awk < $(srcdir)/test_gnunet_arm.py.in > test_gnunet_arm.py
-#	chmod +x test_gnunet_arm.py
-#
-#EXTRA_DIST = \
-#  test_arm_api_data.conf \
-#  test_gnunet_arm.py.in
diff --git a/src/cli/cadet/Makefile.am b/src/cli/cadet/Makefile.am
@@ -1,26 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-plugindir = $(libdir)/gnunet
-
-AM_CLFAGS = -g
-
-bin_PROGRAMS = \
- gnunet-cadet
-
-gnunet_cadet_SOURCES = \
-  gnunet-cadet.c
-gnunet_cadet_LDADD = \
-  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_cadet_LDFLAGS = \
-  $(GN_LIBINTL)
diff --git a/src/cli/core/Makefile.am b/src/cli/core/Makefile.am
@@ -1,24 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-plugindir = $(libdir)/gnunet
-
-libexecdir= $(pkglibdir)/libexec/
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-bin_PROGRAMS = \
- gnunet-core
-
-gnunet_core_SOURCES = \
- gnunet-core.c
-gnunet_core_LDADD = \
-  $(top_builddir)/src/service/core/libgnunetcore.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_core_LDFLAGS = \
-  $(GN_LIBINTL)
diff --git a/src/cli/datastore/Makefile.am b/src/cli/datastore/Makefile.am
@@ -1,24 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIBS = -lgcov
-endif
-
-
-bin_PROGRAMS = \
- gnunet-datastore
-
-gnunet_datastore_SOURCES = \
- gnunet-datastore.c
-gnunet_datastore_LDADD = \
-  $(top_builddir)/src/service/datastore/libgnunetdatastore.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
diff --git a/src/cli/dht/Makefile.am b/src/cli/dht/Makefile.am
@@ -1,52 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-bin_PROGRAMS = \
- gnunet-dht-monitor \
- gnunet-dht-get \
- gnunet-dht-put \
- gnunet-dht-hello
-
-gnunet_dht_get_SOURCES = \
- gnunet-dht-get.c
-gnunet_dht_get_LDADD = \
-  $(top_builddir)/src/service/dht/libgnunetdht.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_dht_get_LDFLAGS = \
-  $(GN_LIBINTL)
-
-gnunet_dht_hello_SOURCES = \
- gnunet-dht-hello.c
-gnunet_dht_hello_LDADD = \
-  $(top_builddir)/src/service/dht/libgnunetdht.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_dht_hello_LDFLAGS = \
-  $(GN_LIBINTL)
-
-gnunet_dht_put_SOURCES = \
- gnunet-dht-put.c
-gnunet_dht_put_LDADD = \
-  $(top_builddir)/src/service/dht/libgnunetdht.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_dht_put_LDFLAGS = \
-  $(GN_LIBINTL)
-
-gnunet_dht_monitor_SOURCES = \
- gnunet-dht-monitor.c
-gnunet_dht_monitor_LDADD = \
-  $(top_builddir)/src/service/dht/libgnunetdht.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_dht_monitor_LDFLAGS = \
-  $(GN_LIBINTL)
-
diff --git a/src/cli/fs/Makefile.am b/src/cli/fs/Makefile.am
@@ -1,107 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-bin_PROGRAMS = \
-  gnunet-auto-share \
-  gnunet-directory \
-  gnunet-download \
-  gnunet-publish \
-  gnunet-search \
-  gnunet-fs \
-  gnunet-unindex
-
-gnunet_directory_SOURCES = \
- gnunet-directory.c
-gnunet_directory_LDADD = \
-  $(top_builddir)/src/service/fs/libgnunetfs.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-if HAVE_LIBEXTRACTOR
-gnunet_directory_LDADD += \
-  -lextractor
-endif
-
-gnunet_fs_SOURCES = \
- gnunet-fs.c
-gnunet_fs_LDADD = \
-  $(top_builddir)/src/service/fs/libgnunetfs.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-if HAVE_LIBEXTRACTOR
-gnunet_fs_LDADD += \
-  -lextractor
-endif
-
-gnunet_download_SOURCES =  \
- gnunet-download.c
-gnunet_download_LDADD =  \
- $(top_builddir)/src/service/fs/libgnunetfs.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(GN_LIBINTL)
-
-gnunet_publish_SOURCES =  \
- gnunet-publish.c
-gnunet_publish_LDADD =  \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/service/fs/libgnunetfs.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(GN_LIBINTL)
-
-if HAVE_LIBEXTRACTOR
-gnunet_publish_LDADD += \
-  -lextractor
-endif
-
-gnunet_auto_share_SOURCES =  \
- gnunet-auto-share.c
-gnunet_auto_share_LDADD =  \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(GN_LIBINTL)
-
-if HAVE_LIBEXTRACTOR
-gnunet_auto_share_LDADD += \
-  -lextractor
-endif
-
-gnunet_helper_fs_publish_SOURCES =  \
- gnunet-helper-fs-publish.c
-gnunet_helper_fs_publish_LDADD =  \
-  $(top_builddir)/src/service/fs/libgnunetfs.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-if HAVE_LIBEXTRACTOR
-gnunet_helper_fs_publish_LDADD += \
-  -lextractor
-endif
-
-gnunet_search_SOURCES = \
- gnunet-search.c
-gnunet_search_LDADD = \
-  $(top_builddir)/src/service/fs/libgnunetfs.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-if HAVE_LIBEXTRACTOR
-gnunet_search_LDADD += \
-  -lextractor
-endif
-
-
-gnunet_unindex_SOURCES = \
- gnunet-unindex.c
-gnunet_unindex_LDADD = \
-  $(top_builddir)/src/service/fs/libgnunetfs.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
diff --git a/src/cli/gns/Makefile.am b/src/cli/gns/Makefile.am
@@ -1,108 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-pkgdata_DATA = \
-  gnunet-gns-proxy-ca.template
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-endif
-
-if HAVE_LIBIDN
-  LIBIDN= -lidn
-else
-  LIBIDN=
-endif
-
-if HAVE_LIBIDN2
-  LIBIDN2= -lidn2
-else
-  LIBIDN2=
-endif
-
-pkgcfgdir = $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-plugindir = $(libdir)/gnunet
-
-bin_PROGRAMS = \
-  gnunet-gns
-
-bin_SCRIPTS = \
-  gnunet-gns-proxy-setup-ca
-
-gnunet-gns-proxy-setup-ca: gnunet-gns-proxy-setup-ca.in Makefile
-	$(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/scripts/dosubst.awk < $(srcdir)/gnunet-gns-proxy-setup-ca.in > gnunet-gns-proxy-setup-ca
-	@chmod +x gnunet-gns-proxy-setup-ca
-
-test_gnunet_gns.sh: test_gnunet_gns.sh.in Makefile
-	$(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/scripts/dosubst.awk < $(srcdir)/test_gnunet_gns.sh.in > test_gnunet_gns.sh
-	@chmod +x test_gnunet_gns.sh
-
-CLEANFILES = test_gnunet_gns.sh
-
-gnunet_gns_SOURCES = \
- gnunet-gns.c
-gnunet_gns_LDADD = \
-  $(top_builddir)/src/service/gns/libgnunetgns.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LIBIDN) $(LIBIDN2) \
-  $(GN_LIBINTL)
-
-check_SCRIPTS = \
-   test_gns_lookup.sh \
-   test_gns_config_lookup.sh \
-   test_gns_ipv6_lookup.sh\
-   test_gns_txt_lookup.sh\
-   test_gns_caa_lookup.sh\
-   test_gns_mx_lookup.sh \
-   test_gns_gns2dns_lookup.sh \
-   test_gns_gns2dns_zkey_lookup.sh \
-   test_gns_gns2dns_cname_lookup.sh \
-   test_gns_dht_lookup.sh\
-   test_gns_delegated_lookup.sh \
-   test_gns_at_lookup.sh\
-   test_gns_zkey_lookup.sh\
-   test_gns_rel_expiration.sh\
-   test_gns_soa_lookup.sh\
-   test_gns_revocation.sh\
-   test_gns_redirect_lookup.sh
-
-EXTRA_DIST = \
-  test_gns_defaults.conf \
-  test_gns_lookup.conf \
-  test_gns_simple_lookup.conf \
-  openssl.cnf \
-  gnunet-gns-proxy-setup-ca.in \
-  zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey \
-  zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey \
-  zonefiles/test_zonekey \
-  test_gns_lookup.sh \
-  test_gns_config_lookup.sh \
-  test_gns_ipv6_lookup.sh\
-  test_gns_txt_lookup.sh\
-  test_gns_caa_lookup.sh\
-  test_gns_mx_lookup.sh \
-  test_gns_gns2dns_lookup.sh \
-  test_gns_gns2dns_zkey_lookup.sh \
-  test_gns_gns2dns_cname_lookup.sh \
-  test_gns_dht_lookup.sh\
-  test_gns_delegated_lookup.sh \
-  test_gns_at_lookup.sh\
-  test_gns_zkey_lookup.sh\
-  test_gns_rel_expiration.sh\
-  test_gns_soa_lookup.sh\
-  test_gns_revocation.sh\
-  test_gns_redirect_lookup.sh\
-	$(pkgdata_DATA) \
-  test_gnunet_gns.sh.in
-
-if ENABLE_TEST_RUN
-if HAVE_SQLITE
- AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
- TESTS = $(check_SCRIPTS)
-endif
-endif
diff --git a/src/cli/hello/Makefile.am b/src/cli/hello/Makefile.am
@@ -1,25 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-plugindir = $(libdir)/gnunet
-
-libexecdir= $(pkglibdir)/libexec/
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-bin_PROGRAMS = \
- gnunet-hello
-
-gnunet_hello_SOURCES = \
- gnunet-hello.c
-gnunet_hello_LDADD = \
-  $(top_builddir)/src/lib/hello/libgnunethello.la \
-  $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_hello_LDFLAGS = \
-  $(GN_LIBINTL)
diff --git a/src/cli/identity/Makefile.am b/src/cli/identity/Makefile.am
@@ -1,35 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-bin_PROGRAMS = \
- gnunet-identity
-
-gnunet_identity_SOURCES = \
- gnunet-identity.c
-gnunet_identity_LDADD = \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-check_SCRIPTS = \
-  test_identity_messages.sh
-
-# if ENABLE_TEST_RUN
-# AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-# TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
-# endif
-
-
-EXTRA_DIST = \
-  test_identity_messages.sh
-
diff --git a/src/cli/messenger/Makefile.am b/src/cli/messenger/Makefile.am
@@ -1,25 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-AM_CLFAGS = -g
-
-bin_PROGRAMS = \
- gnunet-messenger
-
-gnunet_messenger_SOURCES = \
- gnunet-messenger.c
-gnunet_messenger_LDADD = \
- $(top_builddir)/src/service/messenger/libgnunetmessenger.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_messenger_LDFLAGS = \
-  $(GN_LIBINTL)
diff --git a/src/cli/namecache/Makefile.am b/src/cli/namecache/Makefile.am
@@ -1,20 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include $(POSTGRESQL_CPPFLAGS)
-
-plugindir = $(libdir)/gnunet
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-bin_PROGRAMS = \
- gnunet-namecache
-
-gnunet_namecache_SOURCES = \
- gnunet-namecache.c
-gnunet_namecache_LDADD = \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
-  $(GN_LIBINTL)
diff --git a/src/cli/namestore/Makefile.am b/src/cli/namestore/Makefile.am
@@ -1,70 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include $(POSTGRESQL_CPPFLAGS)
-
-plugindir = $(libdir)/gnunet
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-sqldir = $(prefix)/share/gnunet/sql/
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIBS = -lgcov
-endif
-
-
-bin_PROGRAMS = \
- gnunet-namestore \
- gnunet-namestore-dbtool \
- gnunet-namestore-zonefile \
- gnunet-zoneimport
-
-gnunet_namestore_zonefile_SOURCES = \
- gnunet-namestore-zonefile.c
-gnunet_namestore_zonefile_LDADD = \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la  \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-gnunet_zoneimport_SOURCES = \
- gnunet-zoneimport.c
-gnunet_zoneimport_LDADD = \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-gnunet_namestore_SOURCES = \
- gnunet-namestore.c
-gnunet_namestore_LDADD = \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(GN_LIBINTL)
-
-gnunet_namestore_dbtool_SOURCES = \
- gnunet-namestore-dbtool.c
-gnunet_namestore_dbtool_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(GN_LIBINTL)
-
-
-
-check_SCRIPTS = \
-  test_namestore_put.sh \
-  test_namestore_put_stdin.sh \
-  test_namestore_lookup.sh \
-  test_namestore_delete.sh \
-  test_namestore_zonefile_import.sh
-
-EXTRA_DIST = \
-  example_zonefile \
-  $(check_SCRIPTS)
diff --git a/src/cli/nat-auto/Makefile.am b/src/cli/nat-auto/Makefile.am
@@ -1,26 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-bin_PROGRAMS = \
- gnunet-nat-auto \
- gnunet-nat-server
-
-gnunet_nat_server_SOURCES = \
- gnunet-nat-server.c
-gnunet_nat_server_LDADD = \
-  $(top_builddir)/src/service/nat/libgnunetnatnew.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_nat_server_LDFLAGS = \
-  $(GN_LIBINTL)
-
-gnunet_nat_auto_SOURCES = \
-  gnunet-nat-auto.c
-gnunet_nat_auto_LDADD = \
-  $(top_builddir)/src/service/nat-auto/libgnunetnatauto.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_nat_auto_LDFLAGS = \
-  $(GN_LIBINTL)
diff --git a/src/cli/nat/Makefile.am b/src/cli/nat/Makefile.am
@@ -1,17 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-bin_PROGRAMS = \
- gnunet-nat
-
-gnunet_nat_SOURCES = \
-  gnunet-nat.c
-gnunet_nat_LDADD = \
-  $(top_builddir)/src/service/nat/libgnunetnatnew.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_nat_LDFLAGS = \
-  $(GN_LIBINTL)
diff --git a/src/cli/nse/Makefile.am b/src/cli/nse/Makefile.am
@@ -1,19 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-bin_PROGRAMS = gnunet-nse
-
-gnunet_nse_SOURCES = gnunet-nse.c
-gnunet_nse_LDADD = \
-  $(top_builddir)/src/service/nse/libgnunetnse.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(XLIB) $(GN_LIBINTL)
diff --git a/src/cli/reclaim/Makefile.am b/src/cli/reclaim/Makefile.am
@@ -1,57 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
- plugindir = $(libdir)/gnunet
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-
-EXTRA_DIST = \
-  test_reclaim_defaults.conf \
-  test_reclaim.conf \
-  $(check_SCRIPTS)
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-bin_PROGRAMS = \
- gnunet-reclaim \
- gnunet-did
-
-gnunet_reclaim_SOURCES = \
- gnunet-reclaim.c
-gnunet_reclaim_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/service/reclaim/libgnunetreclaim.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(GN_LIBINTL)
-
-gnunet_did_SOURCES = \
-	gnunet-did.c
-gnunet_did_LDADD = \
-	$(top_builddir)/src/lib/util/libgnunetutil.la \
-	$(top_builddir)/src/service/gns/libgnunetgns.la \
-	$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-	$(top_builddir)/src/service/identity/libgnunetidentity.la \
-	$(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/service/reclaim/libgnunetdid.la \
-	-ljansson
-gnunet_did_CFLAGS = \
-	-I$(top_builddir)/src/service/reclaim
-
-check_SCRIPTS = \
-  test_reclaim_attribute.sh \
-  test_reclaim_issue.sh \
-  test_reclaim_consume.sh
-
-if ENABLE_TEST_RUN
- AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
- TESTS = \
-  $(check_SCRIPTS) \
-  $(check_PROGRAMS)
-endif
diff --git a/src/cli/revocation/Makefile.am b/src/cli/revocation/Makefile.am
@@ -1,52 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-bin_PROGRAMS = \
- gnunet-revocation
-
-gnunet_revocation_SOURCES = \
- gnunet-revocation.c
-gnunet_revocation_LDADD = \
-  $(top_builddir)/src/service/revocation/libgnunetrevocation.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-gnunet_revocation_tvg_SOURCES = \
- gnunet-revocation-tvg.c
-gnunet_revocation_tvg_LDADD = \
-  $(top_builddir)/src/service/revocation/libgnunetrevocation.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-noinst_PROGRAMS = \
- gnunet-revocation-tvg
-
-check_SCRIPTS = \
- #test_local_revocation.py
-
-if ENABLE_TEST_RUN
- AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
- TESTS = \
- $(check_SCRIPTS) \
- $(check_PROGRAMS)
-endif
-
-test_local_revocation.py: test_local_revocation.py.in Makefile
-	$(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/scripts/dosubst.awk < $(srcdir)/test_local_revocation.py.in > test_local_revocation.py
-	chmod +x test_local_revocation.py
-
-EXTRA_DIST = test_local_revocation.py.in
diff --git a/src/cli/statistics/Makefile.am b/src/cli/statistics/Makefile.am
@@ -1,40 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-bin_PROGRAMS = \
- gnunet-statistics
-
-gnunet_statistics_SOURCES = \
- gnunet-statistics.c
-gnunet_statistics_LDADD = \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-# Config file still in service folder
-#if HAVE_PYTHON
-#check_SCRIPTS = \
-#  test_gnunet_statistics.py
-#endif
-#
-#SUFFIXES = .py.in .py
-#.py.in.py:
-#	$(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/scripts/dosubst.awk < $(srcdir)/$< > $@
-#	chmod +x $@
-#
-#test_gnunet_statistics.py: test_gnunet_statistics.py.in Makefile
-#	$(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/scripts/dosubst.awk < $(srcdir)/test_gnunet_statistics.py.in > test_gnunet_statistics.py
-#	chmod +x test_gnunet_statistics.py
-#
-#EXTRA_DIST = \
-#  test_statistics_api_data.conf \
-#  test_gnunet_statistics.py.in
diff --git a/src/cli/util/Makefile.am b/src/cli/util/Makefile.am
@@ -1,108 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-gnunet_config_diff_SOURCES = \
- gnunet-config-diff.c
-gnunet_config_diff_LDADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-GNUNET_ECC = gnunet-ecc
-GNUNET_SCRYPT = gnunet-scrypt
-
-libexec_PROGRAMS = \
- gnunet-timeout
-
-bin_PROGRAMS = \
- gnunet-base32 \
- gnunet-config \
- gnunet-resolver \
- $(GNUNET_ECC) \
- $(GNUNET_SCRYPT) \
- gnunet-uri
-if HAVE_ZBAR
-bin_PROGRAMS += gnunet-qr
-endif
-
-noinst_PROGRAMS = \
- gnunet-config-diff \
- gnunet-crypto-tvg
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
-endif
-
-gnunet_timeout_SOURCES = \
- gnunet-timeout.c
-
-gnunet_resolver_SOURCES = \
- gnunet-resolver.c
-gnunet_resolver_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-gnunet_crypto_tvg_SOURCES = \
- gnunet-crypto-tvg.c
-gnunet_crypto_tvg_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL) -lgcrypt -ljansson
-
-gnunet_ecc_SOURCES = \
- gnunet-ecc.c
-gnunet_ecc_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL) -lgcrypt
-
-gnunet_base32_SOURCES = \
- gnunet-base32.c
-gnunet_base32_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-gnunet_scrypt_SOURCES = \
- gnunet-scrypt.c
-gnunet_scrypt_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL) -lgcrypt
-
-
-gnunet_config_SOURCES = \
- gnunet-config.c
-gnunet_config_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-gnunet_uri_SOURCES = \
- gnunet-uri.c
-gnunet_uri_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-
-gnunet_qr_SOURCES = \
-  gnunet-qr.c
-gnunet_qr_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-gnunet_qr_LDFLAGS= -lzbar
-if HAVE_PNG
-gnunet_qr_LDFLAGS += -lpng
-endif
-
-check_SCRIPTS = \
- test_crypto_vectors.sh
-
-EXTRA_DIST = \
-  test_crypto_vectors.sh \
-  crypto-test-vectors.json
diff --git a/src/cli/vpn/Makefile.am b/src/cli/vpn/Makefile.am
@@ -1,22 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-plugindir = $(libdir)/gnunet
-
-bin_PROGRAMS = \
-  gnunet-vpn
-
-gnunet_vpn_SOURCES = \
- gnunet-vpn.c
-gnunet_vpn_LDADD = \
-  $(top_builddir)/src/service/vpn/libgnunetvpn.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
diff --git a/src/contrib/Makefile.am b/src/contrib/Makefile.am
@@ -1,3 +0,0 @@
-SUBDIRS = \
-	service \
-	cli
diff --git a/src/contrib/cli/Makefile.am b/src/contrib/cli/Makefile.am
@@ -1,2 +0,0 @@
-SUBDIRS = \
-	template
diff --git a/src/contrib/cli/template/Makefile.am b/src/contrib/cli/template/Makefile.am
@@ -1,21 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-if USE_COVERAGE
-  AM_CFLAGS = -fprofile-arcs -ftest-coverage
-endif
-
-noinst_PROGRAMS = \
- gnunet-template
-
-
-gnunet_template_SOURCES = \
- gnunet-template.c
-gnunet_template_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_template_LDFLAGS = \
-  $(GN_LIBINTL)
diff --git a/src/contrib/service/Makefile.am b/src/contrib/service/Makefile.am
@@ -1,23 +0,0 @@
-if HAVE_EXPERIMENTAL
- EXP_DIR = \
-  rps \
-  abd \
-  auction
-endif
-
-if BUILD_PULSE_HELPERS
-CONVERSATION_DIR = conversation
-else
-if BUILD_GST_HELPERS
-CONVERSATION_DIR = conversation
-endif
-endif
-
-SUBDIRS = \
-	template \
-	set \
-	consensus \
-	secretsharing \
-	scalarproduct \
-  $(CONVERSATION_DIR) \
-	$(EXP_DIR)
diff --git a/src/contrib/service/abd/Makefile.am b/src/contrib/service/abd/Makefile.am
@@ -1,106 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-EXTRA_DIST = \
-  test_abd_defaults.conf \
-  test_abd_lookup.conf \
-  $(check_SCRIPTS) \
-  $(pkgdata_DATA)
-
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-endif
-
-pkgcfgdir = $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-plugindir = $(libdir)/gnunet
-
-pkgcfg_DATA = \
-  abd.conf
-
-
-# /usr/lib - compiles a layer which can be used to be communicagte with the service
-lib_LTLIBRARIES = \
-  libgnunetabd.la
-
-# /usr/lib/gnunet/libexec - Business logic . Separate process
-libexec_PROGRAMS = \
-  gnunet-service-abd
-
-bin_PROGRAMS = \
-  gnunet-abd
-
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_gnsrecord_abd.la
-
-
-gnunet_abd_SOURCES = \
- gnunet-abd.c
-gnunet_abd_LDADD = \
-  libgnunetabd.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-	$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(GN_LIBINTL)
-
-
-libgnunet_plugin_gnsrecord_abd_la_SOURCES = \
-  plugin_gnsrecord_abd.c
-libgnunet_plugin_gnsrecord_abd_la_LIBADD = \
-	libgnunetabd.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(LTLIBINTL)
-libgnunet_plugin_gnsrecord_abd_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
-
-gnunet_service_abd_SOURCES = \
- gnunet-service-abd.c
-gnunet_service_abd_LDADD = \
-	libgnunetabd.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-	$(top_builddir)/src/service/gns/libgnunetgns.la \
-	$(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(GN_LIBINTL)
-
-
-libgnunetabd_la_SOURCES = \
- abd_api.c abd.h\
- abd_serialization.c \
- abd_serialization.h \
- delegate_misc.c \
- delegate_misc.h
-libgnunetabd_la_LIBADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(XLIB)
-libgnunetabd_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)
-
-
-
-check_SCRIPTS = \
-  test_abd_issue.sh 
-  # test_abd_verify_simple.sh \
-  # test_abd_verify.sh \
-  # test_abd_verify_and.sh
-
-if ENABLE_TEST_RUN
-if HAVE_SQLITE
- AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
- TESTS = $(check_SCRIPTS)
-endif
-endif
-
-
-
-
-
diff --git a/src/contrib/service/auction/Makefile.am b/src/contrib/service/auction/Makefile.am
@@ -1,75 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-pkgcfgdir = $(pkgdatadir)/config.d/
-
-libexecdir = $(pkglibdir)/libexec/
-
-
-pkgcfg_DATA = \
-	auction.conf
-
-if USE_COVERAGE
-	AM_CFLAGS = -fprofile-arcs -ftest-coverage
-endif
-
-
-libexec_PROGRAMS = \
-	gnunet-service-auction
-
-gnunet_service_auction_SOURCES = \
-	gnunet-service-auction.c
-gnunet_service_auction_LDADD = \
-	$(top_builddir)/src/lib/util/libgnunetutil.la \
-	-ljansson \
-	$(GN_LIBINTL)
-
-
-bin_PROGRAMS = \
-	gnunet-auction-create \
-	gnunet-auction-info \
-	gnunet-auction-join
-
-gnunet_auction_create_SOURCES = \
-	gnunet-auction-create.c
-gnunet_auction_create_LDADD = \
-	$(top_builddir)/src/lib/util/libgnunetutil.la \
-	-ljansson \
-	$(GN_LIBINTL)
-
-gnunet_auction_info_SOURCES = \
-	gnunet-auction-info.c
-gnunet_auction_info_LDADD = \
-	$(top_builddir)/src/lib/util/libgnunetutil.la \
-	-ljansson \
-	$(GN_LIBINTL)
-
-gnunet_auction_join_SOURCES = \
-	gnunet-auction-join.c
-gnunet_auction_join_LDADD = \
-	$(top_builddir)/src/lib/util/libgnunetutil.la \
-	-ljansson \
-	$(GN_LIBINTL)
-
-
-check_PROGRAMS = \
-	test_auction_api
-
-test_auction_api_SOURCES = \
-	test_auction_api.c
-test_auction_api_LDADD = \
-	$(top_builddir)/src/lib/util/libgnunetutil.la
-
-
-check_SCRIPTS = \
-	test_auction_create.sh
-
-EXTRA_DIST = \
-  auction.h \
-  auction.conf \
-  $(check_SCRIPTS)
-
-if ENABLE_TEST_RUN
-	AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-	TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
-endif
diff --git a/src/contrib/service/consensus/Makefile.am b/src/contrib/service/consensus/Makefile.am
@@ -1,106 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-plugindir = $(libdir)/gnunet
-
-pkgcfg_DATA = \
-  consensus.conf
-
-if USE_COVERAGE
-  AM_CFLAGS = -fprofile-arcs -ftest-coverage
-endif
-
-
-libexec_PROGRAMS = \
- gnunet-service-consensus
-
-if ENABLE_MALICIOUS
-libexec_PROGRAMS += \
- gnunet-service-evil-consensus
-endif
-
-SUFFIXES = .py.in .py
-
-.py.in.py:
-	$(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/scripts/dosubst.awk < $< > $@
-	chmod +x $@
-
-check-python-style:
-	flake8 consensus-simulation.py.in
-
-lib_LTLIBRARIES = \
-  libgnunetconsensus.la
-
-gnunet_service_consensus_SOURCES = \
- gnunet-service-consensus.c
-gnunet_service_consensus_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/core/libgnunetcore.la \
-  $(top_builddir)/src/contrib/service/set/libgnunetset.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(GN_LIBINTL)
-
-gnunet_service_evil_consensus_SOURCES = \
- gnunet-service-consensus.c \
- consensus_protocol.h
-gnunet_service_evil_consensus_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/core/libgnunetcore.la \
-  $(top_builddir)/src/contrib/service/set/libgnunetset.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(GN_LIBINTL)
-gnunet_service_evil_consensus_CFLAGS = -DEVIL
-
-libgnunetconsensus_la_SOURCES = \
-  consensus_api.c \
-  consensus.h
-libgnunetconsensus_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunetconsensus_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)
-
-
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_consensus.la
-
-libgnunet_plugin_block_consensus_la_SOURCES = \
-  plugin_block_consensus.c
-libgnunet_plugin_block_consensus_la_LIBADD = \
-  $(top_builddir)/src/lib/block/libgnunetblock.la \
-  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_block_consensus_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
-
-#check_PROGRAMS = \
-# test_consensus_api
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = $(check_PROGRAMS)
-endif
-
-test_consensus_api_SOURCES = \
- test_consensus_api.c
-test_consensus_api_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  libgnunetconsensus.la
-
-noinst_SCRIPTS = \
-	consensus-simulation.py
-
-CLEANFILES = \
-	$(noinst_SCRIPTS)
-
-EXTRA_DIST = \
-  test_consensus.conf \
-  consensus-simulation.py.in
diff --git a/src/contrib/service/conversation/Makefile.am b/src/contrib/service/conversation/Makefile.am
@@ -1,263 +0,0 @@
-# This Makefile.am is in the public domain
-SUBDIRS = .
-
-plugindir = $(libdir)/gnunet
-
-AM_CPPFLAGS = \
-  $(GNUNET_CPPFLAGS) \
-  -I$(top_srcdir)/src/include \
-  -I$(top_srcdir)
-
-
-if BUILD_CONVERSATION
-lib_LTLIBRARIES = \
- libgnunetmicrophone.la \
- libgnunetspeaker.la \
- libgnunetconversation.la
-
-bin_PROGRAMS = \
- gnunet-conversation-test \
- gnunet-conversation
-
-libexec_PROGRAMS = \
-  gnunet-service-conversation
-
-#check_PROGRAMS = \
-# test_conversation_api \
-# test_conversation_api_reject \
-# test_conversation_api_twocalls
-
-pkgcfg_DATA = conversation.conf
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_gnsrecord_conversation.la
-
-
-libgnunet_plugin_gnsrecord_conversation_la_SOURCES = \
-  plugin_gnsrecord_conversation.c
-libgnunet_plugin_gnsrecord_conversation_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_gnsrecord_conversation_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
-libgnunetmicrophone_la_SOURCES = \
-  microphone.c
-libgnunetmicrophone_la_LIBADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-libgnunetmicrophone_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)   \
-  -version-info 0:0:0
-
-libgnunetspeaker_la_SOURCES = \
-  speaker.c
-libgnunetspeaker_la_LIBADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-libgnunetspeaker_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)   \
-  -version-info 0:0:0
-
-
-libgnunetconversation_la_SOURCES = \
-  conversation_api.c \
-  conversation_api_call.c \
-  conversation.h
-libgnunetconversation_la_LIBADD = \
-  $(top_builddir)/src/service/gns/libgnunetgns.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-libgnunetconversation_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)   \
-  -version-info 0:0:0
-
-
-if BUILD_PULSE_HELPERS
-AUDIO_HELPER_RECD=gnunet-helper-audio-record
-AUDIO_HELPER_PLAY=gnunet-helper-audio-playback
-#AUDIO_TESTS=$(check_PROGRAMS)
-else
-if BUILD_GST_HELPERS
-AUDIO_HELPER_RECD=gnunet-helper-audio-record
-AUDIO_HELPER_PLAY=gnunet-helper-audio-playback
-#AUDIO_TESTS=$(check_PROGRAMS)
-else
-if BUILD_EXPERIMENTAL_HELPERS
-AUDIO_HELPER_RECD=gnunet-helper-audio-record
-AUDIO_HELPER_PLAY=gnunet-helper-audio-playback
-#AUDIO_TESTS=$(check_PROGRAMS)
-endif
-endif
-endif
-
-if BUILD_CONVERSATION
-libexec_PROGRAMS += \
-  $(AUDIO_HELPER_RECD) \
-  $(AUDIO_HELPER_PLAY)
-endif
-
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-if ENABLE_TEST_RUN
-TESTS = $(AUDIO_TESTS)
-endif
-
-if BUILD_PULSE_HELPERS
-gnunet_helper_audio_record_SOURCES = \
-  gnunet-helper-audio-record.c
-gnunet_helper_audio_record_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  -lpulse  -lopus -logg \
-  $(INTLLIBS)
-#gnunet_helper_audio_record_LDFLAGS = \
-#
-
-gnunet_helper_audio_playback_SOURCES = \
-  gnunet-helper-audio-playback.c
-gnunet_helper_audio_playback_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  -lpulse -lopus -logg \
-  $(INTLLIBS)
-#gnunet_helper_audio_playback_LDFLAGS = \
-#
-else
-if BUILD_GST_HELPERS
-gnunet_helper_audio_record_SOURCES = \
-  gnunet-helper-audio-record-gst.c
-gnunet_helper_audio_record_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GST_LIBS) \
-  $(INTLLIBS)
-gnunet_helper_audio_record_LDFLAGS = \
-   $(GST_LDFLAGS)
-gnunet_helper_audio_record_CFLAGS = \
- $(GST_CFLAGS)
-
-gnunet_helper_audio_playback_SOURCES = \
-    gnunet-helper-audio-playback-gst.c
-gnunet_helper_audio_playback_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GST_LIBS) \
-  $(INTLLIBS)
-gnunet_helper_audio_playback_LDFLAGS = \
-   $(GST_LDFLAGS)
-gnunet_helper_audio_playback_CFLAGS = \
- $(GST_CFLAGS) -DIS_SPEAKER
-else
-if BUILD_EXPERIMENTAL_HELPERS
-gnunet_helper_audio_record_SOURCES = \
-  gnunet_gst_test.c gnunet_gst.c
-gnunet_helper_audio_record_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GST_LIBS) \
-  $(INTLLIBS)
-gnunet_helper_audio_record_LDFLAGS = \
-   $(GST_LDFLAGS)
-gnunet_helper_audio_record_CFLAGS = \
- $(GST_CFLAGS) -DIS_MIC
-
-gnunet_helper_audio_playback_SOURCES = \
-    gnunet_gst_test.c gnunet_gst.c
-gnunet_helper_audio_playback_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GST_LIBS) \
-  $(INTLLIBS)
-gnunet_helper_audio_playback_LDFLAGS = \
-   $(GST_LDFLAGS)
-gnunet_helper_audio_playback_CFLAGS = \
- $(GST_CFLAGS) -DIS_SPEAKER
-endif
-endif
-endif
-
-gnunet_service_conversation_SOURCES = \
-  gnunet-service-conversation.c
-gnunet_service_conversation_LDADD = \
-  libgnunetconversation.la \
-  libgnunetspeaker.la \
-  libgnunetmicrophone.la \
-  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(INTLLIBS)
-#gnunet_service_conversation_LDFLAGS = \
-#
-
-gnunet_conversation_SOURCES = \
-  gnunet-conversation.c
-gnunet_conversation_LDADD = \
-  libgnunetmicrophone.la \
-  libgnunetspeaker.la \
-  libgnunetconversation.la \
-  $(top_builddir)/src/service/gns/libgnunetgns.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(INTLLIBS)
-#gnunet_conversation_LDFLAGS = \
-#
-
-gnunet_conversation_test_SOURCES = \
-  gnunet-conversation-test.c
-gnunet_conversation_test_LDADD = \
-  libgnunetmicrophone.la \
-  libgnunetspeaker.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la  \
-  $(INTLLIBS)
-#gnunet_conversation_test_LDFLAGS = \
-#
-
-
-test_conversation_api_SOURCES = \
- test_conversation_api.c
-test_conversation_api_LDADD = \
-  libgnunetconversation.la \
-  libgnunetspeaker.la \
-  libgnunetmicrophone.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-test_conversation_api_LDFLAGS = \
-  -export-dynamic
-
-test_conversation_api_twocalls_SOURCES = \
- test_conversation_api_twocalls.c
-test_conversation_api_twocalls_LDADD = \
-  libgnunetconversation.la \
-  libgnunetspeaker.la \
-  libgnunetmicrophone.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-test_conversation_api_twocalls_LDFLAGS = \
-  -export-dynamic
-
-test_conversation_api_reject_SOURCES = \
- test_conversation_api_reject.c
-test_conversation_api_reject_LDADD = \
-  libgnunetconversation.la \
-  libgnunetspeaker.la \
-  libgnunetmicrophone.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-test_conversation_api_reject_LDFLAGS = \
-  -export-dynamic
-
-
-
-EXTRA_DIST = test_conversation.conf
diff --git a/src/contrib/service/rps/Makefile.am b/src/contrib/service/rps/Makefile.am
@@ -1,149 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfg_DATA = \
-  rps.conf
-
-bin_PROGRAMS = gnunet-rps
-
-gnunet_rps_SOURCES = \
-  gnunet-rps.c
-
-gnunet_rps_LDADD = \
-  libgnunetrps.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(XLIB) $(GN_LIBINTL)
-
-lib_LTLIBRARIES = libgnunetrps.la
-
-libgnunetrps_la_SOURCES = \
- gnunet-service-rps_sampler_elem.h gnunet-service-rps_sampler_elem.c \
-  rps-test_util.h rps-test_util.c \
-  rps-sampler_common.h rps-sampler_common.c \
-  rps-sampler_client.h rps-sampler_client.c \
-  rps_api.c rps.h
-libgnunetrps_la_LIBADD = \
-  $(top_builddir)/src/service/nse/libgnunetnse.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL) $(XLIB)
-libgnunetrps_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)   \
-  -version-info 0:0:0
-# Fix 'created both with libtool and without' error:
-libgnunetrps_la_CFLAGS = $(AM_CFLAGS)
-
-
-libexec_PROGRAMS = \
- gnunet-service-rps
-
-gnunet_service_rps_SOURCES = \
- gnunet-service-rps_sampler_elem.h gnunet-service-rps_sampler_elem.c \
- rps-sampler_common.h rps-sampler_common.c \
- gnunet-service-rps_sampler.h gnunet-service-rps_sampler.c \
- gnunet-service-rps_custommap.h gnunet-service-rps_custommap.c \
- gnunet-service-rps_view.h gnunet-service-rps_view.c \
- gnunet-service-rps.c
-
-
-gnunet_service_rps_LDADD = \
-  libgnunetrps.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
-  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/service/nse/libgnunetnse.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/service/core/libgnunetcore.la \
-  $(LIBGCRYPT_LIBS) \
-  -lm -lgcrypt \
-  $(GN_LIBINTL)
-
-
-check_PROGRAMS = \
- test_service_rps_view \
- test_service_rps_custommap \
- test_service_rps_sampler_elem
- # test_rps_single_req \
- # test_rps_churn
- # test_rps_sub \
- # test_rps_seed_request 
-#if ENABLE_MALICIOUS
-#check_PROGRAMS += \
-# test_rps_malicious_1 \
-# test_rps_malicious_2 \
-# test_rps_malicious_3
-#endif
-
-rps_test_src = \
-	test_rps.c \
-	rps-test_util.h rps-test_util.c \
- gnunet-service-rps_sampler_elem.h gnunet-service-rps_sampler_elem.c \
- rps-sampler_common.h rps-sampler_common.c \
- gnunet-service-rps_sampler.h gnunet-service-rps_sampler.c
-
-#ld_rps_test_lib = \
-#	libgnunetrps.la \
-#  $(top_builddir)/src/lib/util/libgnunetutil.la \
-#  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-#  $(top_builddir)/src/testbed/libgnunettestbed.la \
-#  -lm
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = $(check_PROGRAMS)
-endif
-
-test_service_rps_view_SOURCES = \
-  gnunet-service-rps_view.h gnunet-service-rps_view.c \
-  test_service_rps_view.c
-test_service_rps_view_LDADD = $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_service_rps_custommap_SOURCES = \
-  gnunet-service-rps_custommap.h gnunet-service-rps_custommap.c \
-  test_service_rps_custommap.c
-test_service_rps_custommap_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_service_rps_sampler_elem_SOURCES = \
-  gnunet-service-rps_sampler_elem.h gnunet-service-rps_sampler_elem.c \
-  rps-test_util.h rps-test_util.c \
-  test_service_rps_sampler_elem.c
-test_service_rps_sampler_elem_LDADD = $(top_builddir)/src/lib/util/libgnunetutil.la
-
-#test_rps_single_req_SOURCES = $(rps_test_src)
-#test_rps_single_req_LDADD = $(ld_rps_test_lib)
-#
-#test_rps_seed_request_SOURCES = $(rps_test_src)
-#test_rps_seed_request_LDADD = $(ld_rps_test_lib)
-#
-#test_rps_req_cancel_SOURCES = $(rps_test_src)
-#test_rps_req_cancel_LDADD = $(ld_rps_test_lib)
-#
-#test_rps_sub_SOURCES = $(rps_test_src)
-#test_rps_sub_LDADD = $(ld_rps_test_lib)
-#
-#test_rps_seed_big_SOURCES = $(rps_test_src)
-#test_rps_seed_big_LDADD = $(ld_rps_test_lib)
-#
-#test_rps_churn_SOURCES = $(rps_test_src)
-#test_rps_churn_LDADD = $(ld_rps_test_lib)
-#
-#test_rps_malicious_1_SOURCES = $(rps_test_src)
-#test_rps_malicious_1_LDADD = $(ld_rps_test_lib)
-#
-#test_rps_malicious_2_SOURCES = $(rps_test_src)
-#test_rps_malicious_2_LDADD = $(ld_rps_test_lib)
-#
-#test_rps_malicious_3_SOURCES = $(rps_test_src)
-#test_rps_malicious_3_LDADD = $(ld_rps_test_lib)
-
-EXTRA_DIST = \
-  test_rps.conf
diff --git a/src/contrib/service/scalarproduct/Makefile.am b/src/contrib/service/scalarproduct/Makefile.am
@@ -1,117 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfg_DATA = \
-  scalarproduct.conf
-
-if USE_COVERAGE
-  AM_CFLAGS = -fprofile-arcs -ftest-coverage
-endif
-
-bin_PROGRAMS = \
- gnunet-scalarproduct
-
-libexec_PROGRAMS = \
- gnunet-service-scalarproduct-alice \
- gnunet-service-scalarproduct-bob \
- gnunet-service-scalarproduct-ecc-alice \
- gnunet-service-scalarproduct-ecc-bob
-
-lib_LTLIBRARIES = \
-  libgnunetscalarproduct.la
-
-gnunet_scalarproduct_SOURCES = \
-  gnunet-scalarproduct.c
-gnunet_scalarproduct_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  libgnunetscalarproduct.la \
-  $(LIBGCRYPT_LIBS) \
-  -lgcrypt \
-  $(GN_LIBINTL)
-
-gnunet_service_scalarproduct_alice_SOURCES = \
-  gnunet-service-scalarproduct.h \
-  gnunet-service-scalarproduct_alice.c
-gnunet_service_scalarproduct_alice_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/service/seti/libgnunetseti.la \
-  $(LIBGCRYPT_LIBS) \
-  -lgcrypt \
-  $(GN_LIBINTL)
-
-gnunet_service_scalarproduct_bob_SOURCES = \
-  gnunet-service-scalarproduct.h \
-  gnunet-service-scalarproduct_bob.c
-gnunet_service_scalarproduct_bob_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/service/seti/libgnunetseti.la \
-  $(LIBGCRYPT_LIBS) \
-  -lgcrypt \
-  $(GN_LIBINTL)
-
-gnunet_service_scalarproduct_ecc_alice_SOURCES = \
-  gnunet-service-scalarproduct-ecc.h \
-  gnunet-service-scalarproduct-ecc_alice.c
-gnunet_service_scalarproduct_ecc_alice_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/service/seti/libgnunetseti.la \
-  $(LIBGCRYPT_LIBS) \
-  -lsodium \
-  -lgcrypt \
-  $(GN_LIBINTL)
-
-gnunet_service_scalarproduct_ecc_bob_SOURCES = \
-  gnunet-service-scalarproduct-ecc.h \
-  gnunet-service-scalarproduct-ecc_bob.c
-gnunet_service_scalarproduct_ecc_bob_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/service/seti/libgnunetseti.la \
-  $(LIBGCRYPT_LIBS) \
-  -lsodium \
-  -lgcrypt \
-  $(GN_LIBINTL)
-
-libgnunetscalarproduct_la_SOURCES = \
-  scalarproduct_api.c \
-  scalarproduct.h
-libgnunetscalarproduct_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(LIBGCRYPT_LIBS) \
-  -lgcrypt \
-  $(LTLIBINTL)
-libgnunetscalarproduct_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)
-
-EXTRA_DIST = \
-  test_scalarproduct.conf \
-  $(check_SCRIPTS)
-
-# Need deprecated and removed testbed profiler
-#check_SCRIPTS = \
-#  test_scalarproduct.sh \
-#  test_scalarproduct_negative.sh \
-#  test_scalarproduct_negativezero.sh
-
-check_PROGRAMS = \
-  # test_ecc_scalarproduct
-
-if ENABLE_TEST_RUN
-  AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-  TESTS = $(check_SCRIPTS) $(check_PROGRAMS)
-endif
-
-
-test_ecc_scalarproduct_SOURCES = \
- test_ecc_scalarproduct.c
-test_ecc_scalarproduct_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  -lsodium
diff --git a/src/contrib/service/secretsharing/Makefile.am b/src/contrib/service/secretsharing/Makefile.am
@@ -1,61 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfg_DATA = \
-  secretsharing.conf
-
-if USE_COVERAGE
-  AM_CFLAGS = -fprofile-arcs -ftest-coverage
-endif
-
-
-libexec_PROGRAMS = \
- gnunet-service-secretsharing
-
-lib_LTLIBRARIES = \
-  libgnunetsecretsharing.la
-
-
-gnunet_service_secretsharing_SOURCES = \
- gnunet-service-secretsharing.c \
- secretsharing_common.c \
- secretsharing_protocol.h
-gnunet_service_secretsharing_CFLAGS = $(AM_CFLAGS)
-gnunet_service_secretsharing_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/contrib/service/consensus/libgnunetconsensus.la \
-  $(LIBGCRYPT_LIBS) \
-  $(GN_LIBINTL)
-
-libgnunetsecretsharing_la_SOURCES = \
-  secretsharing_api.c \
-  secretsharing_common.c \
-  secretsharing.h
-libgnunetsecretsharing_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LIBGCRYPT_LIBS) \
-  $(LTLIBINTL)
-libgnunetsecretsharing_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)
-
-check_PROGRAMS = \
- # test_secretsharing_api
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = $(check_PROGRAMS)
-endif
-
-test_secretsharing_api_SOURCES = \
- test_secretsharing_api.c
-test_secretsharing_api_LDADD = \
-  libgnunetsecretsharing.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-EXTRA_DIST = \
-  test_secretsharing.conf
diff --git a/src/contrib/service/set/Makefile.am b/src/contrib/service/set/Makefile.am
@@ -1,111 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-plugindir = $(libdir)/gnunet
-
-pkgcfg_DATA = \
-  set.conf
-
-if USE_COVERAGE
-  AM_CFLAGS = -fprofile-arcs -ftest-coverage
-endif
-
-noinst_PROGRAMS = \
- gnunet-set-ibf-profiler
-
-libexec_PROGRAMS = \
- gnunet-service-set
-
-lib_LTLIBRARIES = \
-  libgnunetset.la
-
-gnunet_set_ibf_profiler_SOURCES = \
- gnunet-set-ibf-profiler.c \
- ibf.c
-gnunet_set_ibf_profiler_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-gnunet_service_set_SOURCES = \
- gnunet-service-set.c gnunet-service-set.h \
- gnunet-service-set_union.c gnunet-service-set_union.h \
- gnunet-service-set_intersection.c gnunet-service-set_intersection.h \
- ibf.c ibf.h \
- gnunet-service-set_union_strata_estimator.c gnunet-service-set_union_strata_estimator.h \
- gnunet-service-set_protocol.h
-gnunet_service_set_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/service/core/libgnunetcore.la \
-  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/lib/block/libgnunetblock.la \
-  libgnunetset.la \
-  $(GN_LIBINTL)
-
-libgnunetset_la_SOURCES = \
-  set_api.c set.h
-libgnunetset_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunetset_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)
-
-check_PROGRAMS = \
- # test_set_api \
- # test_set_union_result_symmetric \
- # test_set_intersection_result_full \
- test_set_union_copy
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = $(check_PROGRAMS)
-endif
-
-test_set_api_SOURCES = \
- test_set_api.c
-test_set_api_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  libgnunetset.la
-
-test_set_union_result_symmetric_SOURCES = \
- test_set_union_result_symmetric.c
-test_set_union_result_symmetric_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  libgnunetset.la
-
-test_set_intersection_result_full_SOURCES = \
- test_set_intersection_result_full.c
-test_set_intersection_result_full_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  libgnunetset.la
-
-test_set_union_copy_SOURCES = \
- test_set_union_copy.c
-test_set_union_copy_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  libgnunetset.la
-
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_set_test.la
-
-libgnunet_plugin_block_set_test_la_SOURCES = \
-  plugin_block_set_test.c
-libgnunet_plugin_block_set_test_la_LIBADD = \
-  $(top_builddir)/src/lib/block/libgnunetblock.la \
-  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_block_set_test_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
-EXTRA_DIST = \
-  test_set.conf
diff --git a/src/contrib/service/template/Makefile.am b/src/contrib/service/template/Makefile.am
@@ -1,41 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-dist_pkgcfg_DATA = \
-  template.conf
-
-if USE_COVERAGE
-  AM_CFLAGS = -fprofile-arcs -ftest-coverage
-endif
-
-# Note: In a real installation,
-# bin_PROGRAMS should be used for gnunet-template
-# libexec_PROGRAMS should be used for gnunet-service-template
-
-noinst_PROGRAMS = \
- gnunet-service-template
-
-
-gnunet_service_template_SOURCES = \
- gnunet-service-template.c
-gnunet_service_template_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-
-check_PROGRAMS = \
- test_template_api
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = $(check_PROGRAMS)
-endif
-
-test_template_api_SOURCES = \
- test_template_api.c
-test_template_api_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
@@ -1,126 +0,0 @@
-# This Makefile.am is in the public domain
-SUBDIRS = .
-
-gnunetincludedir = $(includedir)/gnunet
-
-EXTRA_DIST = \
-  platform.h \
-  block_fs.h \
-  block_dns.h \
-  block_regex.h
-
-gnunetinclude_HEADERS = \
-  gnunet_config.h \
-  gettext.h \
-  compat.h \
-  gnunet_abd_service.h \
-  gnunet_applications.h \
-  gnunet_arm_service.h \
-  gnunet_bandwidth_lib.h \
-  gnunet_bio_lib.h \
-  gnunet_dht_block_types.h \
-  gnunet_block_lib.h \
-  gnunet_block_group_lib.h \
-  gnunet_block_plugin.h \
-  gnunet_buffer_lib.h \
-  gnunet_child_management_lib.h \
-  gnunet_client_lib.h \
-  gnunet_common.h \
-  gnunet_constants.h \
-  gnunet_configuration_lib.h \
-  gnunet_consensus_service.h \
-  gnunet_container_lib.h \
-  gnunet_conversation_service.h \
-  gnunet_core_service.h \
-  gnunet_crypto_lib.h \
-  gnunet_curl_lib.h \
-  gnunet_datacache_lib.h \
-  gnunet_datacache_plugin.h \
-  gnunet_datastore_service.h \
-  gnunet_datastore_plugin.h \
-  gnunet_db_lib.h \
-  gnunet_dht_service.h \
-  gnunet_dhtu_plugin.h \
-  gnunet_disk_lib.h \
-  gnunet_dnsparser_lib.h \
-  gnunet_dnsstub_lib.h \
-  gnunet_dns_service.h \
-  gnunet_error_codes.h \
-  gnunet_fs_service.h \
-  gnunet_getopt_lib.h \
-  gnunet_gns_service.h \
-  gnunet_gnsrecord_lib.h \
-  gnunet_gnsrecord_json_lib.h \
-  gnunet_gnsrecord_plugin.h \
-  gnu_name_system_record_types.h \
-  gnu_name_system_protocols.h \
-  gnu_name_system_service_ports.h \
-  gnunet_hello_uri_lib.h \
-  gnunet_helper_lib.h \
-  gnunet_identity_service.h \
-  gnunet_reclaim_lib.h \
-  gnunet_reclaim_plugin.h \
-  gnunet_reclaim_service.h \
-  gnunet_json_lib.h \
-  gnunet_mhd_lib.h \
-  gnunet_load_lib.h \
-  gnunet_cadet_service.h \
-  gnunet_messenger_service.h \
-  gnunet_mhd_compat.h \
-  gnunet_microphone_lib.h \
-  gnunet_mst_lib.h \
-  gnunet_mq_lib.h \
-  gnunet_namecache_plugin.h \
-  gnunet_namecache_service.h \
-  gnunet_namestore_plugin.h \
-  gnunet_namestore_service.h \
-  gnunet_nat_auto_service.h \
-  gnunet_nat_service.h \
-  gnunet_nat_lib.h \
-  gnunet_nc_lib.h \
-  gnunet_network_lib.h \
-  gnunet_nse_service.h \
-  gnunet_nt_lib.h \
-  gnunet_os_lib.h \
-  gnunet_peer_lib.h \
-  gnunet_peerstore_plugin.h \
-  gnunet_peerstore_service.h \
-  gnunet_plugin_lib.h \
-  gnunet_pq_lib.h \
-  gnunet_program_lib.h \
-  gnunet_protocols.h \
-  gnunet_resolver_service.h \
-  gnunet_regex_service.h \
-  gnunet_rest_lib.h \
-  gnunet_rest_plugin.h \
-  gnunet_rps_service.h \
-  gnunet_revocation_service.h \
-  gnunet_scalarproduct_service.h \
-  gnunet_scheduler_lib.h \
-  gnunet_secretsharing_service.h \
-  gnunet_service_lib.h \
-  gnunet_set_service.h \
-  gnunet_seti_service.h \
-  gnunet_setu_service.h \
-  gnunet_signal_lib.h \
-  gnunet_signatures.h \
-  gnunet_socks.h \
-  gnunet_speaker_lib.h \
-  gnunet_sq_lib.h \
-  gnunet_statistics_service.h \
-  gnunet_strings_lib.h \
-  gnunet_testing_lib.h \
-  gnunet_testing_arm_lib.h \
-  gnunet_testing_core_lib.h \
-  gnunet_testing_testbed_lib.h \
-  gnunet_testing_transport_lib.h \
-  gnunet_testbed_lib.h \
-  gnunet_time_lib.h \
-  gnunet_transport_application_service.h \
-  gnunet_transport_communication_service.h \
-  gnunet_transport_monitor_service.h \
-  gnunet_transport_core_service.h \
-  gnunet_tun_lib.h \
-  gnunet_uri_lib.h \
-  gnunet_util_lib.h \
-  gnunet_vpn_service.h
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
@@ -1,15 +0,0 @@
-if HAVE_POSTGRESQL
- POSTGRES_DIR = pq
-endif
-
-SUBDIRS = \
-	util \
-	curl \
-	json \
-	mhd \
-	sq \
-	$(POSTGRES_DIR) \
-	hello \
-	block \
-	gnsrecord \
-	testing
diff --git a/src/lib/block/Makefile.am b/src/lib/block/Makefile.am
@@ -1,31 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage
-endif
-
-lib_LTLIBRARIES = \
-  libgnunetblock.la \
-  libgnunetblockgroup.la
-
-libgnunetblock_la_SOURCES = \
-  block.c
-libgnunetblock_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-libgnunetblock_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS) \
-  $(GN_LIBINTL) \
-  -version-info 0:0:0
-
-libgnunetblockgroup_la_SOURCES = \
-  bg_bf.c
-libgnunetblockgroup_la_LIBADD = \
-  libgnunetblock.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-libgnunetblockgroup_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS) \
-  $(GN_LIBINTL) \
-  -version-info 0:0:0
diff --git a/src/lib/curl/Makefile.am b/src/lib/curl/Makefile.am
@@ -1,38 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-lib_LTLIBRARIES = \
-  libgnunetcurl.la
-
-libgnunetcurl_la_LDFLAGS = \
-  $(GN_LIBINTL) \
-  -version-info 0:1:0 \
-  -no-undefined
-libgnunetcurl_la_SOURCES = \
-  curl.c curl_internal.h \
-  curl_reschedule.c
-libgnunetcurl_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  -ljansson \
-  @LIBCURL@ \
-  $(XLIB)
-libgnunetcurl_la_CPPFLAGS = \
- @LIBCURL_CPPFLAGS@ $(AM_CPPFLAGS) $(MHD_CFLAGS)
-
-#check_PROGRAMS = \
-#  test_curl
-
-#TESTS = \
-#  $(check_PROGRAMS)
-
-#test_curl_SOURCES = \
-#  test_curl.c
-#test_curl_LDADD = \
-#  libgnunetcurl.la \
-#  $(top_builddir)/src/lib/util/libgnunetutil.la \
-#  -ljansson -lcurl
diff --git a/src/lib/gnsrecord/Makefile.am b/src/lib/gnsrecord/Makefile.am
@@ -1,106 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include ${MHD_CFLAGS}
-
-plugindir = $(libdir)/gnunet
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIBS = -lgcov
-endif
-
-noinst_PROGRAMS = \
-  gnunet-gnsrecord-tvg
-
-
-check_PROGRAMS = \
- test_gnsrecord_crypto \
- test_gnsrecord_serialization \
- test_gnsrecord_lsd0001testvectors \
- test_gnsrecord_block_expiration \
- perf_gnsrecord_crypto
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = \
-  $(check_PROGRAMS) \
-  $(check_SCRIPTS)
-endif
-
-lib_LTLIBRARIES = \
-  libgnunetgnsrecord.la \
-  libgnunetgnsrecordjson.la
-
-gnunet_gnsrecord_tvg_SOURCES = \
- gnunet-gnsrecord-tvg.c \
- gnsrecord_crypto.h
-gnunet_gnsrecord_tvg_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  libgnunetgnsrecord.la \
-  $(GN_LIBINTL)
-
-
-libgnunetgnsrecord_la_SOURCES = \
-  gnsrecord.c \
-  gnsrecord_serialization.c \
-  gnsrecord_crypto.c \
-  gnsrecord_pow.c \
-  gnsrecord_misc.c
-libgnunetgnsrecord_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LIBGCRYPT_LIBS) \
-  -lsodium \
-  $(GN_LIBINTL)
-libgnunetgnsrecord_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 0:0:0
-
-libgnunetgnsrecordjson_la_SOURCES = \
-  json_gnsrecord.c
-libgnunetgnsrecordjson_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  libgnunetgnsrecord.la \
-  -ljansson \
-  $(GN_LIBINTL)
-libgnunetgnsrecordjson_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 0:0:0
-
-EXTRA_DIST = \
-  $(check_SCRIPTS)
-
-test_gnsrecord_lsd0001testvectors_SOURCES = \
- test_gnsrecord_testvectors.c
-test_gnsrecord_lsd0001testvectors_LDADD = \
-  libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-
-test_gnsrecord_serialization_SOURCES = \
- test_gnsrecord_serialization.c
-test_gnsrecord_serialization_LDADD = \
-  libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_gnsrecord_block_expiration_SOURCES = \
- test_gnsrecord_block_expiration.c
-test_gnsrecord_block_expiration_LDADD = \
-  libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-
-test_gnsrecord_crypto_SOURCES = \
- test_gnsrecord_crypto.c
-test_gnsrecord_crypto_LDADD = \
-  libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-
-perf_gnsrecord_crypto_SOURCES = \
- perf_gnsrecord_crypto.c
-perf_gnsrecord_crypto_LDADD = \
-  libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/lib/hello/Makefile.am b/src/lib/hello/Makefile.am
@@ -1,33 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-lib_LTLIBRARIES = libgnunethello.la
-
-libgnunethello_la_SOURCES = \
-  hello-uri.c
-libgnunethello_la_LIBADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIB) \
- $(LTLIBINTL)
-libgnunethello_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS) \
-  -version-info 1:0:1
-
-check_PROGRAMS = \
- test_hello-uri
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = $(check_PROGRAMS)
-endif
-
-test_hello_uri_SOURCES = \
- test_hello-uri.c
-test_hello_uri_LDADD = \
- libgnunethello.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- -lgcrypt
diff --git a/src/lib/json/Makefile.am b/src/lib/json/Makefile.am
@@ -1,43 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-lib_LTLIBRARIES = \
-  libgnunetjson.la
-
-libgnunetjson_la_LDFLAGS = \
-  $(GN_LIBINTL) \
-  -version-info 3:0:0 \
-  -no-undefined
-libgnunetjson_la_CFLAGS = \
-  $(MHD_CFLAGS) \
-  $(AM_CFLAGS)
-libgnunetjson_la_SOURCES = \
-  json.c \
-  json_generator.c \
-  json_helper.c \
-  json_pack.c
-libgnunetjson_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  -ljansson \
-  $(MHD_LIBS) \
-  $(XLIB) \
-  $(Z_LIBS)
-
-check_PROGRAMS = \
-  test_json
-
-TESTS = \
-  $(check_PROGRAMS)
-
-test_json_SOURCES = \
-  test_json.c
-test_json_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
-test_json_LDADD = \
-  libgnunetjson.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  -ljansson
diff --git a/src/lib/mhd/Makefile.am b/src/lib/mhd/Makefile.am
@@ -1,44 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-lib_LTLIBRARIES = \
-  libgnunetmhd.la
-
-libgnunetmhd_la_LDFLAGS = \
-  $(GN_LIBINTL) \
-  -version-info 0:1:0 \
-  -no-undefined
-libgnunetmhd_la_CFLAGS = \
-  $(MHD_CFLAGS) \
-  $(AM_CFLAGS)
-libgnunetmhd_la_SOURCES = \
-  mhd_upload.c
-libgnunetmhd_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  -lmicrohttpd \
-  -ljansson \
-  $(MHD_LIBS) \
-  $(XLIB) \
-  $(Z_LIBS)
-
-check_PROGRAMS = \
-  test_mhd
-
-TESTS = \
-  $(check_PROGRAMS)
-
-test_json_mhd_SOURCES = \
-  test_mhd.c
-test_json_mhd_LDADD = \
-  libgnunetjson.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  -lmicrohttpd \
-  -ljansson \
-  $(Z_LIBS) \
-  @LIBCURL@
-test_json_mhd_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
diff --git a/src/lib/pq/Makefile.am b/src/lib/pq/Makefile.am
@@ -1,51 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include $(POSTGRESQL_CPPFLAGS)
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage
-endif
-
-sqldir = $(prefix)/share/gnunet/sql/
-
-sql_DATA = \
-  versioning.sql
-
-EXTRA_DIST = \
-  $(sql_DATA)
-
-if HAVE_POSTGRESQL
-lib_LTLIBRARIES = libgnunetpq.la
-endif
-
-libgnunetpq_la_SOURCES = \
-  pq.c \
-  pq.h \
-  pq_connect.c \
-  pq_eval.c \
-  pq_event.c \
-  pq_exec.c \
-  pq_prepare.c \
-  pq_query_helper.c \
-  pq_result_helper.c
-libgnunetpq_la_LIBADD = -lpq \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-libgnunetpq_la_LDFLAGS = \
- $(POSTGRESQL_LDFLAGS) \
- $(GN_LIB_LDFLAGS) \
-  -version-info 9:0:4
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = \
- test_pq
-endif
-
-check_PROGRAMS= \
- test_pq
-
-test_pq_SOURCES = \
-  test_pq.c
-test_pq_LDADD = \
-  libgnunetpq.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la  \
-  -lpq $(XLIB)
diff --git a/src/lib/sq/Makefile.am b/src/lib/sq/Makefile.am
@@ -1,38 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage
-endif
-
-if HAVE_SQLITE
-lib_LTLIBRARIES = libgnunetsq.la
-endif
-
-libgnunetsq_la_SOURCES = \
-  sq.c \
-  sq_exec.c \
-  sq_prepare.c \
-  sq_query_helper.c \
-  sq_result_helper.c
-libgnunetsq_la_LIBADD = -lsqlite3 \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-libgnunetsq_la_LDFLAGS = \
- $(GN_LIBINTL) \
- $(GN_LIB_LDFLAGS) \
-  -version-info 0:0:0
-
-if ENABLE_TEST_RUN
-TESTS = \
- test_sq
-endif
-
-check_PROGRAMS= \
- test_sq
-
-test_sq_SOURCES = \
-  test_sq.c
-test_sq_LDADD = \
-  libgnunetsq.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la  \
-  -lsqlite3 $(XLIB)
diff --git a/src/lib/testing/Makefile.am b/src/lib/testing/Makefile.am
@@ -1,97 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-libexecdir= $(pkglibdir)/libexec/
-
-libexec_PROGRAMS = \
-  gnunet-cmds-helper
-
-plugindir = $(libdir)/gnunet
-
-lib_LTLIBRARIES = \
-  libgnunettesting.la
-
-gnunet_cmds_helper_SOURCES = \
-  gnunet-cmds-helper.c testing_cmds.h
-gnunet_cmds_helper_LDADD = $(XLIB) \
-  libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-
-libgnunettesting_la_SOURCES = \
-  testing_api_barrier.c testing_api_barrier.h \
-  testing_api_cmd_barrier_create.c \
-  testing_api_cmd_barrier_reached.c \
-  testing_api_cmd_batch.c testing_api_cmd_batch.h \
-  testing_api_cmd_exec.c \
-  testing_api_cmd_finish.c \
-  testing_api_cmd_get_topo.c \
-  testing_api_cmd_netjail_start.c \
-  testing_api_cmd_netjail_start_cmds_helper.c \
-  testing_api_cmd_signal.c \
-  testing_api_cmd_stat.c \
-  testing_api_cmds.c testing_cmds.h \
-  testing_api_loop.c testing_api_loop.h \
-  testing_api_main.c \
-  testing_api_traits.c \
-  testing_api_topology.c testing_api_topology.h
-libgnunettesting_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunettesting_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS) \
-  -version-info 3:0:0
-
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
-
-
-bin_PROGRAMS = \
-  gnunet-testing-netjail-launcher
-
-gnunet_testing_netjail_launcher_SOURCES = \
-  gnunet-testing-netjail-launcher.c
-gnunet_testing_netjail_launcher_LDADD = $(XLIB) \
-  libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-
-check_SCRIPTS = \
-  test_netjail_api.sh
-
-TESTS = \
-  $(check_SCRIPTS)
-
-if HAVE_EXPERIMENTAL
-check_PROGRAMS = \
-  test_testing_api
-test_testing_api_SOURCES = \
-  test_testing_api.c
-test_testing_api_LDADD = \
-  libgnunettesting.la \
-  -lgnunetutil \
-  $(XLIB)
-TESTS += $(check_PROGRAMS)
-endif
-
-
-
-EXTRA_DIST = \
-  $(check_SCRIPTS) \
-  test_netjail_topo.conf
-
-plugin_LTLIBRARIES = \
-  libgnunet_test_testing_plugin_ping.la
-
-libgnunet_test_testing_plugin_ping_la_SOURCES = \
- test_testing_plugin_ping.c
-libgnunet_test_testing_plugin_ping_la_LIBADD = \
-  libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_test_testing_plugin_ping_la_LDFLAGS = \
-  $(GN_PLUGIN_LDFLAGS)
diff --git a/src/lib/util/Makefile.am b/src/lib/util/Makefile.am
@@ -1,603 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-dist_pkgcfg_DATA = \
-  util.conf
-
-
-TEST_CLIENT_UNIX_NC = test_client_unix.nc
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-if ENABLE_BENCHMARK
-  BENCHMARK = benchmark.c benchmark.h
-  PTHREAD = -lpthread
-endif
-
-DLOG = crypto_ecc_dlog.c
-DLOG_TEST = test_crypto_ecc_dlog
-
-test_common_logging_dummy_SOURCES = \
- test_common_logging_dummy.c
-test_common_logging_dummy_LDADD = \
- libgnunetutil.la
-
-gnunet_elligator_tvg_SOURCES = \
-  gnunet-elligator-tvg.c
-gnunet_elligator_tvg_LDADD = \
-  libgnunetutil.la \
-  -lsodium \
-  $(LIBGCRYPT_LIBS)
-
-libgnunetutil_la_SOURCES = \
-  bandwidth.c \
-  $(BENCHMARK) \
-  bio.c \
-  buffer.c \
-  child_management.c \
-  client.c \
-  common_allocation.c \
-  common_endian.c \
-  common_logging.c \
-  compress.c \
-  configuration.c \
-  consttime_memcmp.c \
-  container_bloomfilter.c \
-  container_heap.c \
-  container_multihashmap.c \
-  container_multishortmap.c \
-  container_multiuuidmap.c \
-  container_multipeermap.c \
-  container_multihashmap32.c \
-  crypto_blind_sign.c \
-  crypto_crc.c \
-  crypto_cs.c \
-  crypto_ecc.c \
-  crypto_ecc_gnsrecord.c \
-  $(DLOG) \
-  crypto_ecc_setup.c \
-  crypto_edx25519.c \
-  crypto_elligator.c \
-  crypto_hash.c \
-  crypto_hash_file.c \
-  crypto_hkdf.c \
-  crypto_hpke.c \
-  crypto_kdf.c \
-  crypto_mpi.c \
-  crypto_paillier.c \
-  crypto_pkey.c \
-  crypto_pow.c \
-  crypto_random.c \
-  crypto_rsa.c \
-  crypto_symmetric.c \
-  disk.c \
-  disk.h \
-  dnsparser.c \
-  dnsstub.c \
-  getopt.c \
-  getopt_helpers.c \
-  helper.c \
-  load.c \
-  mst.c \
-  mq.c \
-  nat.c \
-  nc.c \
-  network.c \
-  nt.c \
-  os_installation.c \
-  os_network.c \
-  os_priority.c \
-  peer.c \
-  plugin.c \
-  program.c \
-  resolver_api.c resolver.h \
-  scheduler.c \
-  service.c \
-  signal.c \
-  strings.c \
-  time.c \
-  tun.c \
-  uri.c \
-  speedup.c speedup.h \
-  proc_compat.c \
-	gnunet_error_codes.c
-
-if HAVE_LIBIDN
-  LIBIDN= -lidn
-else
-  LIBIDN=
-endif
-
-if HAVE_LIBIDN2
-  LIBIDN2= -lidn2
-else
-  LIBIDN2=
-endif
-
-
-libgnunetutil_la_CFLAGS = \
-  ${MHD_CFLAGS}
-libgnunetutil_la_LIBADD = \
-  $(GCLIBADD) $(WINLIB) \
-  $(LIBGCRYPT_LIBS) \
-  $(LTLIBICONV) \
-  $(LTLIBINTL) \
-  -lltdl \
-  $(LIBIDN) $(LIBIDN2) \
-  $(Z_LIBS) \
-  -lunistring \
-  -lsodium \
-  -lgmp \
-  $(ATOMICLIB) \
-  $(XLIB) \
-  $(PTHREAD)
-
-libgnunetutil_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS) \
-  -version-info 18:1:0
-
-lib_LTLIBRARIES = libgnunetutil.la
-
-noinst_PROGRAMS = \
- test_common_logging_dummy
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
-endif
-
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_utiltest.la
-
-libgnunet_plugin_utiltest_la_SOURCES = \
-  test_plugin_plug.c
-libgnunet_plugin_utiltest_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-if HAVE_BENCHMARKS
- BENCHMARKS = \
-  perf_crypto_cs \
-  perf_crypto_hash \
-  perf_crypto_rsa \
-  perf_crypto_paillier \
-  perf_crypto_symmetric \
-  perf_crypto_asymmetric \
-  perf_malloc \
-  perf_mq \
-  perf_scheduler \
-  perf_crypto_ecc_dlog
-endif
-
-if HAVE_SSH_KEY
-# SSH_USING_TESTS = test_socks.nc
-endif
-
-check_PROGRAMS = \
- test_bio \
- test_child_management \
- test_client.nc \
- $(TEST_CLIENT_UNIX_NC) \
- test_common_allocation \
- test_common_endian \
- test_common_logging \
- test_configuration \
- test_container_bloomfilter \
- test_container_dll \
- test_container_multihashmap \
- test_container_multihashmap32 \
- test_container_multipeermap \
- test_container_heap \
- test_crypto_blind \
- test_crypto_crc \
- test_crypto_cs \
- test_crypto_ecdsa \
- test_crypto_eddsa \
- test_crypto_ecdhe \
- test_crypto_ecdh_eddsa \
- test_crypto_ecdh_ecdsa \
- test_crypto_edx25519 \
- test_crypto_elligator \
- $(DLOG_TEST) \
- test_crypto_hash \
- test_crypto_hash_context \
- test_crypto_hkdf \
- test_crypto_hpke \
- test_crypto_kdf \
- test_crypto_paillier \
- test_crypto_random \
- test_crypto_rsa \
- test_crypto_symmetric \
- test_disk \
- test_getopt \
- test_hexcoder \
- test_mq \
- test_os_network \
- test_peer \
- test_plugin \
- test_program \
- test_scheduler \
- test_scheduler_delay \
- test_scheduler_hogging_cancel \
- test_scheduler_hogging_priority \
- test_service \
- test_strings \
- test_strings_to_data \
- test_speedup \
- test_time \
- test_tun \
- test_uri \
- $(BENCHMARKS) \
- test_os_start_process \
- test_common_logging_runtime_loglevels \
- gnunet-elligator-tvg
-
-test_child_management_SOURCES = \
-  test_child_management.c
-test_child_management_LDADD = \
-  libgnunetutil.la \
-  $(XLIB)
-
-# Declare .nc (NO-CONCURRENCY) as a test extension so that we can impart
-# sequential execution order for them
-TEST_EXTENSIONS = .nc
-test_test_client_unix.log: test_client.log
-
-test_bio_SOURCES = \
- test_bio.c
-test_bio_LDADD = \
- libgnunetutil.la
-
-test_hexcoder_SOURCES = \
- test_hexcoder.c
-test_hexcoder_LDADD = \
- libgnunetutil.la
-
-test_tun_SOURCES = \
- test_tun.c
-test_tun_LDADD = \
- libgnunetutil.la
-
-test_os_start_process_SOURCES = \
- test_os_start_process.c
-test_os_start_process_LDADD = \
- libgnunetutil.la
-
-test_client_nc_SOURCES = \
- test_client.c
-test_client_nc_LDADD = \
- libgnunetutil.la
-
-test_client_unix_nc_SOURCES = \
- test_client.c
-test_client_unix_nc_LDADD = \
- libgnunetutil.la
-
-#test_socks_nc_SOURCES = \
-# test_socks.c
-#test_socks_nc_LDADD = \
-# libgnunetutil.la
-
-test_common_allocation_SOURCES = \
- test_common_allocation.c
-test_common_allocation_LDADD = \
- libgnunetutil.la
-
-test_common_endian_SOURCES = \
- test_common_endian.c
-test_common_endian_LDADD = \
- libgnunetutil.la
-
-test_common_logging_SOURCES = \
- test_common_logging.c
-test_common_logging_LDADD = \
- libgnunetutil.la
-
-test_common_logging_runtime_loglevels_SOURCES = \
- test_common_logging_runtime_loglevels.c
-test_common_logging_runtime_loglevels_LDADD = \
- libgnunetutil.la
-
-test_configuration_SOURCES = \
- test_configuration.c
-test_configuration_LDADD = \
- libgnunetutil.la
-
-test_container_bloomfilter_SOURCES = \
- test_container_bloomfilter.c
-test_container_bloomfilter_LDADD = \
- libgnunetutil.la
-
-test_container_dll_SOURCES = \
- test_container_dll.c
-test_container_dll_LDADD = \
- libgnunetutil.la
-
-test_container_multihashmap_SOURCES = \
- test_container_multihashmap.c
-test_container_multihashmap_LDADD = \
- libgnunetutil.la
-
-test_container_multihashmap32_SOURCES = \
- test_container_multihashmap32.c
-test_container_multihashmap32_LDADD = \
- libgnunetutil.la
-
-test_container_multipeermap_SOURCES = \
- test_container_multipeermap.c
-test_container_multipeermap_LDADD = \
- libgnunetutil.la
-
-test_container_heap_SOURCES = \
- test_container_heap.c
-test_container_heap_LDADD = \
- libgnunetutil.la
-
-test_crypto_blind_SOURCES = \
- test_crypto_blind.c
-test_crypto_blind_LDADD = \
- libgnunetutil.la
-
-test_crypto_symmetric_SOURCES = \
- test_crypto_symmetric.c
-test_crypto_symmetric_LDADD = \
- libgnunetutil.la
-
-test_crypto_crc_SOURCES = \
- test_crypto_crc.c
-test_crypto_crc_LDADD = \
- libgnunetutil.la
-
-test_crypto_cs_SOURCES = \
- test_crypto_cs.c
-test_crypto_cs_LDADD = \
- libgnunetutil.la \
- -lsodium
-
-test_crypto_ecdsa_SOURCES = \
- test_crypto_ecdsa.c
-test_crypto_ecdsa_LDADD = \
- libgnunetutil.la \
- $(LIBGCRYPT_LIBS)
-
-test_crypto_eddsa_SOURCES = \
- test_crypto_eddsa.c
-test_crypto_eddsa_LDADD = \
- libgnunetutil.la \
- $(LIBGCRYPT_LIBS)
-
-test_crypto_edx25519_SOURCES = \
- test_crypto_edx25519.c
-test_crypto_edx25519_LDADD = \
- libgnunetutil.la \
- $(LIBGCRYPT_LIBS)
-
- test_crypto_elligator_SOURCES = \
- test_crypto_elligator.c
-test_crypto_elligator_LDADD = \
- libgnunetutil.la \
- -lsodium \
- $(LIBGCRYPT_LIBS)
-
-test_crypto_ecc_dlog_SOURCES = \
- test_crypto_ecc_dlog.c
-test_crypto_ecc_dlog_LDADD = \
- -lsodium \
- libgnunetutil.la \
- $(LIBGCRYPT_LIBS)
-
-test_crypto_ecdhe_SOURCES = \
- test_crypto_ecdhe.c
-test_crypto_ecdhe_LDADD = \
- libgnunetutil.la \
- $(LIBGCRYPT_LIBS)
-
-test_crypto_ecdh_eddsa_SOURCES = \
- test_crypto_ecdh_eddsa.c
-test_crypto_ecdh_eddsa_LDADD = \
- libgnunetutil.la \
- $(LIBGCRYPT_LIBS)
-
-test_crypto_ecdh_ecdsa_SOURCES = \
- test_crypto_ecdh_ecdsa.c
-test_crypto_ecdh_ecdsa_LDADD = \
- libgnunetutil.la \
- $(LIBGCRYPT_LIBS)
-
-
-test_crypto_hash_SOURCES = \
- test_crypto_hash.c
-test_crypto_hash_LDADD = \
- libgnunetutil.la
-
-test_crypto_hash_context_SOURCES = \
- test_crypto_hash_context.c
-test_crypto_hash_context_LDADD = \
- libgnunetutil.la
-
-test_crypto_hkdf_SOURCES = \
- test_crypto_hkdf.c
-test_crypto_hkdf_LDADD = \
- libgnunetutil.la
-
-test_crypto_hpke_SOURCES = \
- test_crypto_hpke.c
-test_crypto_hpke_LDADD = \
- libgnunetutil.la -lgcrypt
-
-test_crypto_kdf_SOURCES = \
- test_crypto_kdf.c
-test_crypto_kdf_LDADD = \
- libgnunetutil.la -lgcrypt
-
-test_crypto_paillier_SOURCES = \
- test_crypto_paillier.c
-test_crypto_paillier_LDADD = \
- $(LIBGCRYPT_LIBS) \
- libgnunetutil.la
-
-test_crypto_random_SOURCES = \
- test_crypto_random.c
-test_crypto_random_LDADD = \
- libgnunetutil.la
-
-test_crypto_rsa_SOURCES = \
- test_crypto_rsa.c
-test_crypto_rsa_LDADD = \
- libgnunetutil.la -lgcrypt
-
-test_disk_SOURCES = \
- test_disk.c
-test_disk_LDADD = \
- libgnunetutil.la
-
-test_getopt_SOURCES = \
- test_getopt.c
-test_getopt_LDADD = \
- libgnunetutil.la
-
-test_mq_SOURCES = \
- test_mq.c
-test_mq_LDADD = \
- libgnunetutil.la
-
-test_os_network_SOURCES = \
- test_os_network.c
-test_os_network_LDADD = \
- libgnunetutil.la
-
-test_peer_SOURCES = \
- test_peer.c
-test_peer_LDADD = \
- libgnunetutil.la -lgcrypt
-
-test_plugin_SOURCES = \
- test_plugin.c
-test_plugin_LDADD = \
- libgnunetutil.la
-
-test_program_SOURCES = \
- test_program.c
-test_program_LDADD = \
- libgnunetutil.la
-
-test_scheduler_SOURCES = \
- test_scheduler.c
-test_scheduler_LDADD = \
- libgnunetutil.la
-
-test_scheduler_delay_SOURCES = \
- test_scheduler_delay.c
-test_scheduler_delay_LDADD = \
- libgnunetutil.la
-
-test_scheduler_hogging_cancel_SOURCES = \
- test_scheduler_hogging_cancel.c
-test_scheduler_hogging_cancel_LDADD = \
- libgnunetutil.la
-
-test_scheduler_hogging_priority_SOURCES = \
- test_scheduler_hogging_priority.c
-test_scheduler_hogging_priority_LDADD = \
- libgnunetutil.la
-
-test_service_SOURCES = \
- test_service.c
-test_service_LDADD = \
- libgnunetutil.la
-
-test_strings_SOURCES = \
- test_strings.c
-test_strings_LDADD = \
- libgnunetutil.la
-
-test_strings_to_data_SOURCES = \
- test_strings_to_data.c
-test_strings_to_data_LDADD = \
- libgnunetutil.la
-
-
-test_time_SOURCES = \
- test_time.c
-test_time_LDADD = \
- libgnunetutil.la
-
-test_speedup_SOURCES = \
- test_speedup.c
-test_speedup_LDADD = \
- libgnunetutil.la
-
-test_uri_SOURCES = \
- test_uri.c
-test_uri_LDADD = \
- libgnunetutil.la
-
-perf_crypto_cs_SOURCES = \
- perf_crypto_cs.c
-perf_crypto_cs_LDADD = \
- libgnunetutil.la
-
-perf_crypto_hash_SOURCES = \
- perf_crypto_hash.c
-perf_crypto_hash_LDADD = \
- libgnunetutil.la
-
-perf_crypto_ecc_dlog_SOURCES = \
- perf_crypto_ecc_dlog.c
-perf_crypto_ecc_dlog_LDADD = \
- libgnunetutil.la \
- -lsodium
-
-perf_crypto_rsa_SOURCES = \
- perf_crypto_rsa.c
-perf_crypto_rsa_LDADD = \
- libgnunetutil.la
-
-perf_crypto_symmetric_SOURCES = \
- perf_crypto_symmetric.c
-perf_crypto_symmetric_LDADD = \
- libgnunetutil.la
-
-perf_crypto_asymmetric_SOURCES = \
- perf_crypto_asymmetric.c
-perf_crypto_asymmetric_LDADD = \
- libgnunetutil.la
-
-perf_crypto_paillier_SOURCES = \
- perf_crypto_paillier.c
-perf_crypto_paillier_LDADD = \
- libgnunetutil.la \
- -lgcrypt
-
-perf_malloc_SOURCES = \
- perf_malloc.c
-perf_malloc_LDADD = \
- libgnunetutil.la
-
-perf_mq_SOURCES = \
- perf_mq.c
-perf_mq_LDADD = \
- libgnunetutil.la
-
-perf_scheduler_SOURCES = \
- perf_scheduler.c
-perf_scheduler_LDADD = \
- libgnunetutil.la
-
-
-EXTRA_DIST = \
-  test_client_data.conf \
-  test_client_unix.conf \
-  test_configuration_data.conf \
-  test_program_data.conf \
-  test_service_data.conf \
-  test_speedup_data.conf \
-  child_management_test.sh
diff --git a/src/plugin/Makefile.am b/src/plugin/Makefile.am
@@ -1,18 +0,0 @@
-SUBDIRS = \
-	block \
-	dns \
-	gnsrecord \
-	peerstore \
-	datacache \
-	datastore \
-	namecache \
-	namestore \
-	dht \
-	setu \
-	seti \
-	revocation \
-	regex \
-	gns \
-	fs \
-	reclaim \
-	messenger
diff --git a/src/plugin/block/Makefile.am b/src/plugin/block/Makefile.am
@@ -1,37 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage
-endif
-
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_test.la
-
-# Real plugins should of course go into
-# plugin_LTLIBRARIES
-noinst_LTLIBRARIES = \
-  libgnunet_plugin_block_template.la
-
-libgnunet_plugin_block_template_la_SOURCES = \
-  plugin_block_template.c
-libgnunet_plugin_block_template_la_LIBADD = \
-  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
-  $(top_builddir)/src/lib/block/libgnunetblock.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_block_template_la_LDFLAGS = \
-  $(GN_PLUGIN_LDFLAGS)
-
-libgnunet_plugin_block_test_la_SOURCES = \
-  plugin_block_test.c
-libgnunet_plugin_block_test_la_LIBADD = \
-  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
-  $(top_builddir)/src/lib/block/libgnunetblock.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la  \
-  $(LTLIBINTL)
-libgnunet_plugin_block_test_la_LDFLAGS = \
-  $(GN_PLUGIN_LDFLAGS)
-
diff --git a/src/plugin/datacache/Makefile.am b/src/plugin/datacache/Makefile.am
@@ -1,76 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-sqldir = $(prefix)/share/gnunet/sql/
-
-sql_DATA = \
-  datacache-0001.sql \
-  datacache-drop.sql
-
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIBS = -lgcov
-endif
-
-if HAVE_SQLITE
-  SQLITE_PLUGIN = libgnunet_plugin_datacache_sqlite.la
-endif
-if HAVE_POSTGRESQL
-  POSTGRES_PLUGIN = libgnunet_plugin_datacache_postgres.la
-endif
-
-plugin_LTLIBRARIES = \
-  $(SQLITE_PLUGIN) \
-  $(POSTGRES_PLUGIN) \
-  libgnunet_plugin_datacache_heap.la
-
-# Real plugins should of course go into
-# plugin_LTLIBRARIES
-noinst_LTLIBRARIES = \
-  libgnunet_plugin_datacache_template.la
-
-
-libgnunet_plugin_datacache_sqlite_la_SOURCES = \
-  plugin_datacache_sqlite.c
-libgnunet_plugin_datacache_sqlite_la_LIBADD = \
-  $(top_builddir)/src/lib/sq/libgnunetsq.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
-  $(LTLIBINTL)
-libgnunet_plugin_datacache_sqlite_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-libgnunet_plugin_datacache_heap_la_SOURCES = \
-  plugin_datacache_heap.c
-libgnunet_plugin_datacache_heap_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL)
-libgnunet_plugin_datacache_heap_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-libgnunet_plugin_datacache_postgres_la_SOURCES = \
-  plugin_datacache_postgres.c
-libgnunet_plugin_datacache_postgres_la_LIBADD = \
-  $(top_builddir)/src/lib/pq/libgnunetpq.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_PLUGIN_LDFLAGS) -lpq
-libgnunet_plugin_datacache_postgres_la_CPPFLAGS = \
- $(POSTGRESQL_CPPFLAGS) $(AM_CPPFLAGS)
-libgnunet_plugin_datacache_postgres_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS)
-
-libgnunet_plugin_datacache_template_la_SOURCES = \
-  plugin_datacache_template.c
-libgnunet_plugin_datacache_template_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL)
-libgnunet_plugin_datacache_template_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
-EXTRA_DIST = \
- $(sql_DATA)
diff --git a/src/plugin/datastore/Makefile.am b/src/plugin/datastore/Makefile.am
@@ -1,144 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-sqldir = $(prefix)/share/gnunet/sql/
-
-sql_DATA = \
-  datastore-0001.sql \
-  datastore-drop.sql
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIBS = -lgcov
-endif
-
-
-if HAVE_SQLITE
- SQLITE_PLUGIN = libgnunet_plugin_datastore_sqlite.la
-if HAVE_BENCHMARKS
-  SQLITE_BENCHMARKS = \
-   perf_plugin_datastore_sqlite
-endif
- SQLITE_TESTS = \
-  test_plugin_datastore_sqlite \
-  $(SQLITE_BENCHMARKS)
-endif
-if HAVE_POSTGRESQL
- POSTGRES_PLUGIN = libgnunet_plugin_datastore_postgres.la
-if HAVE_BENCHMARKS
-  POSTGRES_BENCHMARKS = \
-   perf_plugin_datastore_postgres
-endif
- POSTGRES_TESTS = \
-  test_plugin_datastore_postgres \
-  $(POSTGRES_BENCHMARKS)
-endif
-
-plugin_LTLIBRARIES = \
-  $(SQLITE_PLUGIN) \
-  $(POSTGRES_PLUGIN) \
-  libgnunet_plugin_datastore_heap.la
-
-# Real plugins should of course go into
-# plugin_LTLIBRARIES
-noinst_LTLIBRARIES = \
-  libgnunet_plugin_datastore_template.la
-
-
-libgnunet_plugin_datastore_sqlite_la_SOURCES = \
-  plugin_datastore_sqlite.c
-libgnunet_plugin_datastore_sqlite_la_LIBADD = \
-  $(top_builddir)/src/lib/sq/libgnunetsq.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
-  $(LTLIBINTL)
-libgnunet_plugin_datastore_sqlite_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
-libgnunet_plugin_datastore_heap_la_SOURCES = \
-  plugin_datastore_heap.c
-libgnunet_plugin_datastore_heap_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL)
-libgnunet_plugin_datastore_heap_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
-libgnunet_plugin_datastore_postgres_la_SOURCES = \
-  plugin_datastore_postgres.c
-libgnunet_plugin_datastore_postgres_la_LIBADD = \
-  $(top_builddir)/src/lib/pq/libgnunetpq.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lpq
-libgnunet_plugin_datastore_postgres_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS)
-libgnunet_plugin_datastore_postgres_la_CPPFLAGS = \
- $(POSTGRESQL_CPPFLAGS) $(AM_CPPFLAGS)
-
-
-libgnunet_plugin_datastore_template_la_SOURCES = \
-  plugin_datastore_template.c
-libgnunet_plugin_datastore_template_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL)
-libgnunet_plugin_datastore_template_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-check_PROGRAMS = \
-  perf_plugin_datastore_heap \
-  test_plugin_datastore_heap \
-  $(SQLITE_TESTS) \
-  $(POSTGRES_TESTS)
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = $(check_PROGRAMS)
-endif
-
-perf_plugin_datastore_heap_SOURCES = \
- perf_plugin_datastore.c
-perf_plugin_datastore_heap_LDADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_plugin_datastore_heap_SOURCES = \
- test_plugin_datastore.c
-test_plugin_datastore_heap_LDADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-
-perf_plugin_datastore_sqlite_SOURCES = \
- perf_plugin_datastore.c
-perf_plugin_datastore_sqlite_LDADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_plugin_datastore_sqlite_SOURCES = \
- test_plugin_datastore.c
-test_plugin_datastore_sqlite_LDADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-
-test_plugin_datastore_postgres_SOURCES = \
- test_plugin_datastore.c
-test_plugin_datastore_postgres_LDADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-perf_plugin_datastore_postgres_SOURCES = \
- perf_plugin_datastore.c
-perf_plugin_datastore_postgres_LDADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-
-EXTRA_DIST = \
- test_defaults.conf \
- perf_plugin_datastore_data_sqlite.conf \
- test_plugin_datastore_data_sqlite.conf \
- perf_plugin_datastore_data_heap.conf \
- test_plugin_datastore_data_heap.conf \
- perf_plugin_datastore_data_postgres.conf \
- test_plugin_datastore_data_postgres.conf \
- $(sql_DATA)
diff --git a/src/plugin/dht/Makefile.am b/src/plugin/dht/Makefile.am
@@ -1,27 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_dht.la
-
-libgnunet_plugin_block_dht_la_SOURCES = \
-  plugin_block_dht.c
-libgnunet_plugin_block_dht_la_LIBADD = \
-  $(top_builddir)/src/lib/hello/libgnunethello.la \
-  $(top_builddir)/src/lib/block/libgnunetblock.la \
-  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_block_dht_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
diff --git a/src/plugin/dns/Makefile.am b/src/plugin/dns/Makefile.am
@@ -1,25 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-plugindir = $(libdir)/gnunet
-
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_dns.la
-
-libgnunet_plugin_block_dns_la_SOURCES = \
-  plugin_block_dns.c
-libgnunet_plugin_block_dns_la_LIBADD = \
-  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
-  $(top_builddir)/src/lib/block/libgnunetblock.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-libgnunet_plugin_block_dns_la_LDFLAGS = \
-  $(GN_LIBINTL) \
-  $(top_builddir)/src/block/$(GN_PLUGIN_LDFLAGS)
diff --git a/src/plugin/fs/Makefile.am b/src/plugin/fs/Makefile.am
@@ -1,35 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-plugindir = $(libdir)/gnunet
-
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_fs.la
-
-libgnunet_plugin_block_fs_la_SOURCES = \
-  plugin_block_fs.c
-libgnunet_plugin_block_fs_la_LIBADD = \
-  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
-  $(top_builddir)/src/lib/block/libgnunetblock.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_block_fs_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-check_PROGRAMS = \
- test_plugin_block_fs
-
-test_plugin_block_fs_SOURCES = \
- test_plugin_block_fs.c
-test_plugin_block_fs_LDADD = \
- $(top_builddir)/src/lib/block/libgnunetblock.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/plugin/gns/Makefile.am b/src/plugin/gns/Makefile.am
@@ -1,59 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if HAVE_LIBIDN
-  LIBIDN= -lidn
-else
-  LIBIDN=
-endif
-
-if HAVE_LIBIDN2
-  LIBIDN2= -lidn2
-else
-  LIBIDN2=
-endif
-
-USE_VPN = $(top_builddir)/src/service/vpn/libgnunetvpn.la
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-endif
-
-pkgcfgdir = $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-plugindir = $(libdir)/gnunet
-
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_gns.la \
-  libgnunet_plugin_gnsrecord_gns.la
-
-
-libgnunet_plugin_gnsrecord_gns_la_SOURCES = \
-  plugin_gnsrecord_gns.c
-libgnunet_plugin_gnsrecord_gns_la_LIBADD = \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_gnsrecord_gns_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
-libgnunet_plugin_block_gns_la_SOURCES = \
-  plugin_block_gns.c
-libgnunet_plugin_block_gns_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/block/libgnunetblock.la \
-  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la
-libgnunet_plugin_block_gns_la_LDFLAGS = \
-  $(GN_LIBINTL) \
-  $(GN_PLUGIN_LDFLAGS)
-
-if ENABLE_TEST_RUN
-if HAVE_SQLITE
- AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
- TESTS = $(check_SCRIPTS)
-endif
-endif
diff --git a/src/plugin/gnsrecord/Makefile.am b/src/plugin/gnsrecord/Makefile.am
@@ -1,25 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include ${MHD_CFLAGS}
-
-plugindir = $(libdir)/gnunet
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIBS = -lgcov
-endif
-
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_gnsrecord_dns.la
-
-
-libgnunet_plugin_gnsrecord_dns_la_SOURCES = \
-  plugin_gnsrecord_dns.c
-libgnunet_plugin_gnsrecord_dns_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_gnsrecord_dns_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
diff --git a/src/plugin/messenger/Makefile.am b/src/plugin/messenger/Makefile.am
@@ -1,26 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_gnsrecord_messenger.la
-
-
-libgnunet_plugin_gnsrecord_messenger_la_SOURCES = \
-  plugin_gnsrecord_messenger.c
-libgnunet_plugin_gnsrecord_messenger_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_gnsrecord_messenger_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
-plugindir = $(libdir)/gnunet
diff --git a/src/plugin/namecache/Makefile.am b/src/plugin/namecache/Makefile.am
@@ -1,105 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include $(POSTGRESQL_CPPFLAGS)
-
-plugindir = $(libdir)/gnunet
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-sqldir = $(prefix)/share/gnunet/sql/
-
-sql_DATA = \
-  namecache-0001.sql \
-  namecache-drop.sql
-
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIBS = -lgcov
-endif
-
-if HAVE_EXPERIMENTAL
-FLAT_PLUGIN = libgnunet_plugin_namecache_flat.la
-FLAT_TESTS = test_plugin_namecache_flat
-endif
-
-if HAVE_SQLITE
-SQLITE_PLUGIN = libgnunet_plugin_namecache_sqlite.la
-SQLITE_TESTS = test_plugin_namecache_sqlite
-endif
-
-if HAVE_POSTGRESQL
-POSTGRES_PLUGIN = libgnunet_plugin_namecache_postgres.la
-POSTGRES_TESTS = test_plugin_namecache_postgres
-endif
-
-if HAVE_SQLITE
-check_PROGRAMS = \
- $(SQLITE_TESTS) \
- $(POSTGRES_TESTS) \
- $(FLAT_TESTS) \
- $(TESTING_TESTS)
-endif
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = \
-  $(check_PROGRAMS)
-endif
-
-plugin_LTLIBRARIES = \
-  $(SQLITE_PLUGIN) \
-	$(FLAT_PLUGIN) \
-  $(POSTGRES_PLUGIN)
-
-libgnunet_plugin_namecache_flat_la_SOURCES = \
-  plugin_namecache_flat.c
-libgnunet_plugin_namecache_flat_la_LIBADD = \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL)
-libgnunet_plugin_namecache_flat_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-libgnunet_plugin_namecache_sqlite_la_SOURCES = \
-  plugin_namecache_sqlite.c
-libgnunet_plugin_namecache_sqlite_la_LIBADD = \
-  $(top_builddir)/src/lib/sq/libgnunetsq.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
-  $(LTLIBINTL)
-libgnunet_plugin_namecache_sqlite_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
-libgnunet_plugin_namecache_postgres_la_SOURCES = \
-  plugin_namecache_postgres.c
-libgnunet_plugin_namecache_postgres_la_LIBADD = \
-  $(top_builddir)/src/lib/pq/libgnunetpq.la  \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lpq \
-  $(LTLIBINTL)
-libgnunet_plugin_namecache_postgres_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS)
-
-test_plugin_namecache_flat_SOURCES = \
- test_plugin_namecache.c
-test_plugin_namecache_flat_LDADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_plugin_namecache_sqlite_SOURCES = \
- test_plugin_namecache.c
-test_plugin_namecache_sqlite_LDADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_plugin_namecache_postgres_SOURCES = \
- test_plugin_namecache.c
-test_plugin_namecache_postgres_LDADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-EXTRA_DIST = \
-  test_plugin_namecache_sqlite.conf \
-  test_plugin_namecache_postgres.conf \
-  test_plugin_namecache_flat.conf \
-  $(sql_DATA)
diff --git a/src/plugin/namestore/Makefile.am b/src/plugin/namestore/Makefile.am
@@ -1,79 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include $(POSTGRESQL_CPPFLAGS)
-
-plugindir = $(libdir)/gnunet
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-sqldir = $(prefix)/share/gnunet/sql/
-
-sql_DATA = \
-  namestore-0001.sql \
-  namestore-drop.sql
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIBS = -lgcov
-endif
-
-
-
-
-plugin_LTLIBRARIES = \
-  $(SQLITE_PLUGIN) \
-  $(POSTGRES_PLUGIN)
-
-
-libgnunet_plugin_namestore_sqlite_la_SOURCES = \
-  plugin_namestore_sqlite.c
-libgnunet_plugin_namestore_sqlite_la_LIBADD = \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la  \
-  $(top_builddir)/src/lib/sq/libgnunetsq.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
-  $(LTLIBINTL)
-libgnunet_plugin_namestore_sqlite_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-libgnunet_plugin_namestore_postgres_la_SOURCES = \
-  plugin_namestore_postgres.c
-libgnunet_plugin_namestore_postgres_la_LIBADD = \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la  \
-  $(top_builddir)/src/lib/pq/libgnunetpq.la  \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lpq \
-  $(LTLIBINTL)
-libgnunet_plugin_namestore_postgres_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS)
-
-if HAVE_SQLITE
-SQLITE_PLUGIN = libgnunet_plugin_namestore_sqlite.la
-SQLITE_TESTS = test_plugin_namestore_sqlite
-endif
-
-
-if HAVE_POSTGRESQL
-POSTGRES_PLUGIN = libgnunet_plugin_namestore_postgres.la
-POSTGRES_TESTS = test_plugin_namestore_postgres
-endif
-if HAVE_SQLITE
-check_PROGRAMS = \
- $(SQLITE_TESTS) \
- $(POSTGRES_TESTS)
-endif
-
-test_plugin_namestore_sqlite_SOURCES = \
- test_plugin_namestore.c
-test_plugin_namestore_sqlite_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_plugin_namestore_postgres_SOURCES = \
-  test_plugin_namestore.c
-test_plugin_namestore_postgres_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-EXTRA_DIST = \
-  test_plugin_namestore_sqlite.conf \
-  test_plugin_namestore_postgres.conf \
-	$(sql_DATA)
-
diff --git a/src/plugin/peerstore/Makefile.am b/src/plugin/peerstore/Makefile.am
@@ -1,45 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-if USE_COVERAGE
-  AM_CFLAGS = -fprofile-arcs -ftest-coverage
-endif
-
-if HAVE_SQLITE
-SQLITE_PLUGIN = libgnunet_plugin_peerstore_sqlite.la
-SQLITE_TESTS = test_plugin_peerstore_sqlite
-libgnunet_plugin_peerstore_sqlite_la_SOURCES = \
-  plugin_peerstore_sqlite.c
-libgnunet_plugin_peerstore_sqlite_la_LIBADD = \
-  $(top_builddir)/src/lib/sq/libgnunetsq.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(XLIBS) -lsqlite3 \
-  $(LTLIBINTL)
-libgnunet_plugin_peerstore_sqlite_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-endif
-
-plugin_LTLIBRARIES = \
-  $(SQLITE_PLUGIN)
-
-test_plugin_peerstore_sqlite_SOURCES = \
-  test_plugin_peerstore.c
-test_plugin_peerstore_sqlite_LDADD = \
-	$(top_builddir)/src/lib/util/libgnunetutil.la
-
-check_PROGRAMS = \
- $(SQLITE_TESTS)
-
-EXTRA_DIST = \
- test_plugin_peerstore_sqlite.conf
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = $(check_PROGRAMS)
-endif
diff --git a/src/plugin/reclaim/Makefile.am b/src/plugin/reclaim/Makefile.am
@@ -1,70 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
- plugindir = $(libdir)/gnunet
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-
-CREDENTIAL_PLUGIN = \
-  libgnunet_plugin_reclaim_credential_jwt.la
-
-if HAVE_PABC
-  CREDENTIAL_PLUGIN += libgnunet_plugin_reclaim_credential_pabc.la
-endif
-
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_gnsrecord_reclaim.la \
-  libgnunet_plugin_reclaim_attribute_basic.la \
-  $(CREDENTIAL_PLUGIN)
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-libgnunet_plugin_gnsrecord_reclaim_la_SOURCES = \
-  plugin_gnsrecord_reclaim.c
-libgnunet_plugin_gnsrecord_reclaim_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_gnsrecord_reclaim_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
-libgnunet_plugin_reclaim_attribute_basic_la_SOURCES = \
-  plugin_reclaim_attribute_basic.c
-libgnunet_plugin_reclaim_attribute_basic_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_reclaim_attribute_basic_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-if HAVE_PABC
-libgnunet_plugin_reclaim_credential_pabc_la_SOURCES = \
-  plugin_reclaim_credential_pabc.c \
-  pabc_helper.c \
-	pabc_helper.h
-libgnunet_plugin_reclaim_credential_pabc_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/reclaim/libgnunetreclaim.la \
-  -ljansson\
-  -lpabc \
-  $(LTLIBINTL)
-libgnunet_plugin_reclaim_credential_pabc_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-endif
-
-
-libgnunet_plugin_reclaim_credential_jwt_la_SOURCES = \
-  plugin_reclaim_credential_jwt.c \
-	$(top_builddir)/src/service/reclaim/reclaim_attribute.c \
-	$(top_builddir)/src/service/reclaim/reclaim_credential.c
-libgnunet_plugin_reclaim_credential_jwt_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  -ljansson\
-  $(LTLIBINTL)
-libgnunet_plugin_reclaim_credential_jwt_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
diff --git a/src/plugin/regex/Makefile.am b/src/plugin/regex/Makefile.am
@@ -1,40 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-plugindir = $(libdir)/gnunet
-
-lib_LTLIBRARIES = \
-  libgnunetregexblock.la
-
-libgnunetregexblock_la_SOURCES = \
-  regex_block_lib.c regex_block_lib.h
-libgnunetregexblock_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(XLIB) \
-  $(LTLIBINTL)
-libgnunetregexblock_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 1:0:0
-
-
-plugin_LTLIBRARIES = \
- libgnunet_plugin_block_regex.la
-
-libgnunet_plugin_block_regex_la_SOURCES = \
- plugin_block_regex.c
-libgnunet_plugin_block_regex_la_LIBADD = \
- libgnunetregexblock.la \
- $(top_builddir)/src/lib/block/libgnunetblock.la \
- $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-libgnunet_plugin_block_regex_la_LDFLAGS = \
- $(GN_LIBINTL) \
- $(GN_PLUGIN_LDFLAGS)
diff --git a/src/plugin/revocation/Makefile.am b/src/plugin/revocation/Makefile.am
@@ -1,27 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_revocation.la
-
-libgnunet_plugin_block_revocation_la_SOURCES = \
-  plugin_block_revocation.c
-libgnunet_plugin_block_revocation_la_LIBADD = \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
-  $(top_builddir)/src/lib/block/libgnunetblock.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la  \
-  $(LTLIBINTL)
-libgnunet_plugin_block_revocation_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
diff --git a/src/plugin/seti/Makefile.am b/src/plugin/seti/Makefile.am
@@ -1,25 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-plugindir = $(libdir)/gnunet
-
-if USE_COVERAGE
-  AM_CFLAGS = -fprofile-arcs -ftest-coverage
-endif
-
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_seti_test.la
-
-libgnunet_plugin_block_seti_test_la_SOURCES = \
-  plugin_block_seti_test.c
-libgnunet_plugin_block_seti_test_la_LIBADD = \
-  $(top_builddir)/src/lib/block/libgnunetblock.la \
-  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_block_seti_test_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
diff --git a/src/plugin/setu/Makefile.am b/src/plugin/setu/Makefile.am
@@ -1,21 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-plugindir = $(libdir)/gnunet
-
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_setu_test.la
-
-libgnunet_plugin_block_setu_test_la_SOURCES = \
-  plugin_block_setu_test.c
-libgnunet_plugin_block_setu_test_la_LIBADD = \
-  $(top_builddir)/src/lib/block/libgnunetblock.la \
-  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_block_setu_test_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
@@ -1,35 +0,0 @@
-SUBDIRS = \
-	util \
-    testbed \
-	statistics \
-	arm \
-	peerstore \
-	nat \
-	nat-auto \
-	transport \
-	pils \
-	core \
-	nse \
-  hostlist \
-  topology \
-  dns \
-	identity \
-	datacache \
-	datastore \
-	dht \
-  namecache \
-  namestore \
-	cadet \
-  seti \
-  setu \
-  regex \
-  revocation \
-	vpn \
-  gns \
-  zonemaster \
-	fs \
-	exit \
-	pt \
-	reclaim \
-	messenger \
-	rest
diff --git a/src/service/arm/Makefile.am b/src/service/arm/Makefile.am
@@ -1,115 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfg_DATA = \
-  arm.conf
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-plugindir = $(libdir)/gnunet
-
-lib_LTLIBRARIES = \
-  libgnunetarm.la \
-  libgnunettestingarm.la
-
-libgnunetarm_la_SOURCES = \
-  arm_api.c \
-  arm_monitor_api.c \
-  arm.h
-libgnunetarm_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL) $(XLIB)
-libgnunetarm_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)   \
-  -version-info 2:0:0
-
-libgnunettestingarm_la_SOURCES = \
-  testing_arm_cmd_start_peer.c \
-  testing_arm_cmd_stop_peer.c \
-  testing_arm_traits.c
-libgnunettestingarm_la_LIBADD = \
-  libgnunetarm.la \
-  $(top_builddir)/src/service/testbed/libgnunettestingtestbed.la \
-  $(top_builddir)/src/service/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/lib/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL) $(XLIB)
-libgnunettestingarm_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)   \
-  -version-info 0:0:0
-
-
-noinst_PROGRAMS = \
- mockup-service
-
-libexec_PROGRAMS = \
- gnunet-service-arm
-
-gnunet_service_arm_SOURCES = \
- gnunet-service-arm.c
-gnunet_service_arm_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-mockup_service_SOURCES = \
-  mockup-service.c
- mockup_service_LDADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-mockup_service_LDFLAGS = \
- $(GN_LIBINTL)
-
-
-check_PROGRAMS = \
- test_arm_api \
- test_exponential_backoff \
- test_gnunet_service_arm
-
-check_SCRIPTS = \
-  test_arm_probnat.sh
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = $(check_PROGRAMS)  $(check_SCRIPTS)
-endif
-
-test_arm_api_SOURCES = \
- test_arm_api.c
-test_arm_api_LDADD = \
-  libgnunetarm.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_exponential_backoff_SOURCES = \
- test_exponential_backoff.c
-test_exponential_backoff_LDADD = \
-  libgnunetarm.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_gnunet_service_arm_SOURCES = \
- test_gnunet_service_arm.c
- test_gnunet_service_arm_LDADD = \
-  libgnunetarm.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-EXTRA_DIST = \
-  test_arm_api_data.conf
-
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_testing_arm_probnat.la
-
-libgnunet_plugin_testing_arm_probnat_la_SOURCES = \
- plugin_testing_arm_probnat.c
-libgnunet_plugin_testing_arm_probnat_la_LIBADD = \
-  libgnunettestingarm.la \
-  $(top_builddir)/src/lib/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/service/testbed/libgnunettestingtestbed.la \
-  libgnunetarm.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
diff --git a/src/service/cadet/Makefile.am b/src/service/cadet/Makefile.am
@@ -1,81 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfg_DATA = \
-  cadet.conf
-
-plugindir = $(libdir)/gnunet
-
-AM_CLFAGS = -g
-
-libexec_PROGRAMS = \
- gnunet-service-cadet
-
-lib_LTLIBRARIES = \
-  libgnunetcadet.la
-
-libgnunetcadet_la_SOURCES = \
-  cadet_api.c \
-  cadet_api_drop_message.c \
-  cadet_api_get_channel.c \
-  cadet_api_get_path.c \
-  cadet_api_list_peers.c \
-  cadet_api_list_tunnels.c \
-  cadet_api_helper.c
-libgnunetcadet_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(XLIB) \
-  $(LTLIBINTL)
-libgnunetcadet_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 7:0:0
-
-gnunet_service_cadet_SOURCES = \
- gnunet-service-cadet.c gnunet-service-cadet.h \
- gnunet-service-cadet_channel.c gnunet-service-cadet_channel.h \
- gnunet-service-cadet_connection.c gnunet-service-cadet_connection.h \
- gnunet-service-cadet_core.c gnunet-service-cadet_core.h \
- gnunet-service-cadet_dht.c gnunet-service-cadet_dht.h \
- gnunet-service-cadet_hello.c gnunet-service-cadet_hello.h \
- gnunet-service-cadet_tunnels.c gnunet-service-cadet_tunnels.h \
- gnunet-service-cadet_paths.c gnunet-service-cadet_paths.h \
- gnunet-service-cadet_peer.c gnunet-service-cadet_peer.h
-gnunet_service_cadet_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/core/libgnunetcore.la \
-  $(top_builddir)/src/service/dht/libgnunetdht.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/service/transport/libgnunettransportapplication.la \
-  $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
-  $(top_builddir)/src/lib/hello/libgnunethello.la \
-  $(top_builddir)/src/lib/block/libgnunetblock.la
-if LINUX
-gnunet_service_cadet_LDFLAGS = -lrt \
-    $(GN_LIBINTL)
-endif
-
-
-test_cadet_local_mq_SOURCES = \
-  test_cadet_local_mq.c
-test_cadet_local_mq_LDADD = \
-  libgnunetcadet.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = $(check_PROGRAMS)
-endif
-
-EXTRA_DIST = \
-  cadet.h cadet_protocol.h \
-  test_cadet.conf
diff --git a/src/service/core/Makefile.am b/src/service/core/Makefile.am
@@ -1,230 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-plugindir = $(libdir)/gnunet
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfg_DATA = \
-  core.conf
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_testing_core_underlay_dummy.la \
-  libgnunet_plugin_testing_core_basic.la
-
-#libgnunet_test_core_plugin_cmd_run_emu.la
-#libgnunet_test_core_plugin_cmd_just_run.la
-
-TESTING_LIBS = \
-  libgnunettestingcore.la
-#libgnunetcoretesting.la
-
-UNDERLAY_DUMMY_LIBS = \
-  libgnunetcoreunderlaydummy.la
-
-lib_LTLIBRARIES = \
-  libgnunetcore.la \
-  libgnunettestingcore.la \
-  $(UNDERLAY_DUMMY_LIBS)
-
-#libgnunetcoretesting.la
-
-libgnunetcore_la_SOURCES = \
-  core_api.c core.h \
-  core_api_monitor_peers.c
-libgnunetcore_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL) $(XLIB)
-libgnunetcore_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 0:1:0
-
-libgnunettestingcore_la_SOURCES = \
-  testing_core_cmd_connect.c \
-  testing_core_cmd_recv.c \
-  testing_core_cmd_send.c \
-  testing_core_traits.c
-libgnunettestingcore_la_LIBADD = \
-  libgnunetcore.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/service/testbed/libgnunettestingtestbed.la \
-  $(top_builddir)/src/service/arm/libgnunettestingarm.la \
-  $(GN_LIBINTL) $(XLIB)
-libgnunettestingcore_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)   \
-  -version-info 0:0:0
-
-
-#libgnunet_test_core_plugin_cmd_run_emu_la_SOURCES = \
-# test_core_plugin_cmd_run_emu.c
-#libgnunet_test_core_plugin_cmd_run_emu_la_LIBADD = \
-#  libgnunetcoretesting.la \
-#  $(top_builddir)/src/service/transport/libgnunettransportapplication.la \
-#  $(top_builddir)/src/service/transport/libgnunettransportcore.la \
-#  $(top_builddir)/src/lib/hello/libgnunethello.la \
-#  $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
-#  $(top_builddir)/src/service/transport/libgnunettransporttesting2.la \
-#  $(top_builddir)/src/service/testing/libgnunettesting.la \
-#  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-#  $(top_builddir)/src/service/arm/libgnunetarm.la \
-#  $(top_builddir)/src/lib/util/libgnunetutil.la \
-#  $(LTLIBINTL)
-#libgnunet_test_core_plugin_cmd_run_emu_la_LDFLAGS = \
-#  $(GN_PLUGIN_LDFLAGS)
-
-libgnunetcoreunderlaydummy_la_SOURCES = \
-  gnunet_core_underlay_dummy.h gnunet_core_underlay_dummy.c
-libgnunetcoreunderlaydummy_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/testing/libgnunettesting.la
-libgnunetcoreunderlaydummy_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)
-
-
-#libgnunetcoretesting_la_SOURCES = \
-#  core_api_cmd_connecting_peers.c
-#libgnunetcoretesting_la_LIBADD = \
-#  $(top_builddir)/src/service/testing/libgnunettesting.la \
-#  $(top_builddir)/src/service/arm/libgnunetarm.la \
-#  $(top_builddir)/src/service/transport/libgnunettransportapplication.la \
-#  $(top_builddir)/src/lib/hello/libgnunethello.la \
-#  $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
-#  $(top_builddir)/src/service/transport/libgnunettransportcore.la \
-#  $(top_builddir)/src/lib/util/libgnunetutil.la
-#libgnunetcoretesting_la_LDFLAGS = \
-#  $(GN_LIBINTL) \
-#  $(GN_LIB_LDFLAGS) \
-#  -version-info 0:0:0
-
-
-libexec_PROGRAMS = \
- gnunet-service-core
-
-# FIXME: This is not the way to go - it should only be built
-# as a dependency of the testing test
-bin_PROGRAMS = \
- test_core_underlay_dummy_testing_launcher
-
-
-gnunet_service_core_SOURCES = \
- gnunet-service-core.c gnunet-service-core.h \
- gnunet-service-core_kx.c gnunet-service-core_kx.h \
- gnunet-service-core_sessions.c gnunet-service-core_sessions.h \
- gnunet-service-core_typemap.c gnunet-service-core_typemap.h
-gnunet_service_core_LDADD = \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/service/transport/libgnunettransportapplication.la \
-  $(top_builddir)/src/service/pils/libgnunetpils.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(UNDERLAY_DUMMY_LIBS) $(GN_LIBINTL) $(Z_LIBS)
-
-
-#TESTING_TESTS = \
-# test_core_api_send_to_self
-
-DUMMY_TESTS = \
-  test_core_underlay_dummy
-
-check_PROGRAMS = \
- test_core_api_start_only \
- $(TESTING_TESTS) \
- $(DUMMY_TESTS)
-
-# Only test TNG if we run experimental
-#check_SCRIPTS= \
-#  test_core_start_testcase.sh
-
-check_SCRIPTS= \
-  test_core_basic.sh
-
-#  test_core_underlay_dummy_testing.sh
-
-# FIXME: This seems not to work
-check_DEPENDENCIES= \
-  test_core_underlay_dummy_testing_launcher
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = \
- $(check_PROGRAMS) \
- $(check_SCRIPTS)
-endif
-
-test_core_api_send_to_self_SOURCES = \
- test_core_api_send_to_self.c
-test_core_api_send_to_self_LDADD = \
- libgnunetcore.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_core_api_start_only_SOURCES = \
- test_core_api_start_only.c
-test_core_api_start_only_LDADD = \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
- libgnunetcore.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_core_underlay_dummy_SOURCES = \
- test_core_underlay_dummy.c
-test_core_underlay_dummy_LDADD = \
- libgnunetcoreunderlaydummy.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-libgnunet_plugin_testing_core_underlay_dummy_la_SOURCES = \
-  test_core_plugin_underlay_dummy.c
-libgnunet_plugin_testing_core_underlay_dummy_la_LIBADD = \
-  libgnunetcoreunderlaydummy.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/testing/libgnunettesting.la
-# FIXME: This seems not to work
-#libgnunet_plugin_testing_core_underlay_dummy_la_DEPENDENCIES = \
-#  test_core_underlay_dummy_testing_launcher
-
-test_core_underlay_dummy_testing_launcher_SOURCES = \
-  test_core_underlay_dummy_testing_launcher.c
-test_core_underlay_dummy_testing_launcher_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/testing/libgnunettesting.la
-test_core_underlay_dummy_testing_launcher_LDFLAGS = \
-  $(GN_LIBINTL) \
-  $(GN_LIB_LDFLAGS)
-
-
-EXTRA_DIST = \
-  $(check_SCRIPTS) \
-  test_core_start_testcase.sh \
-  test_core_underlay_dummy.sh \
-  test_core_basic_peer.conf \
-  test_core_defaults.conf \
-  test_core_api_data.conf \
-  test_core_api_peer1.conf \
-  test_core_api_peer2.conf \
-  test_core_api_send_to_self.conf \
-  test_core_quota_asymmetric_recv_limited_peer1.conf \
-  test_core_quota_asymmetric_recv_limited_peer2.conf \
-  test_core_quota_asymmetric_send_limit_peer1.conf \
-  test_core_quota_asymmetric_send_limit_peer2.conf \
-  test_core_quota_peer1.conf \
-  test_core_quota_peer2.conf \
-  test_core_underlay_dummy_netjail_topo.conf
-
-libgnunet_plugin_testing_core_basic_la_SOURCES = \
- test_core_plugin_basic.c
-libgnunet_plugin_testing_core_basic_la_LIBADD = \
-  libgnunettestingcore.la \
-  $(top_builddir)/src/lib/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/service/testbed/libgnunettestingtestbed.la \
-  $(top_builddir)/src/service/arm/libgnunettestingarm.la \
-  libgnunetcore.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
diff --git a/src/service/datacache/Makefile.am b/src/service/datacache/Makefile.am
@@ -1,98 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-dist_pkgcfg_DATA = \
-  datacache.conf
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIBS = -lgcov
-endif
-
-lib_LTLIBRARIES = \
-  libgnunetdatacache.la
-
-libgnunetdatacache_la_SOURCES = \
-  datacache.c
-libgnunetdatacache_la_LIBADD = \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-libgnunetdatacache_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 0:1:0
-
-
-if HAVE_SQLITE
-SQLITE_TESTS = \
- test_datacache_sqlite \
- test_datacache_quota_sqlite \
- $(SQLITE_BENCHMARKS)
-endif
-
-HEAP_TESTS = \
- test_datacache_heap \
- test_datacache_quota_heap \
- $(HEAP_BENCHMARKS)
-
-if HAVE_POSTGRESQL
-POSTGRES_TESTS = \
- test_datacache_postgres \
- test_datacache_quota_postgres \
- $(POSTGRES_BENCHMARKS)
-endif
-
-check_PROGRAMS = \
- $(SQLITE_TESTS) \
- $(HEAP_TESTS) \
- $(POSTGRES_TESTS)
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = $(check_PROGRAMS)
-endif
-
-test_datacache_sqlite_SOURCES = \
- test_datacache.c
-test_datacache_sqlite_LDADD = \
- libgnunetdatacache.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_datacache_quota_sqlite_SOURCES = \
- test_datacache_quota.c
-test_datacache_quota_sqlite_LDADD = \
- libgnunetdatacache.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_datacache_heap_SOURCES = \
- test_datacache.c
-test_datacache_heap_LDADD = \
- libgnunetdatacache.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_datacache_quota_heap_SOURCES = \
- test_datacache_quota.c
-test_datacache_quota_heap_LDADD = \
- libgnunetdatacache.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_datacache_postgres_SOURCES = \
- test_datacache.c
-test_datacache_postgres_LDADD = \
- libgnunetdatacache.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_datacache_quota_postgres_SOURCES = \
- test_datacache_quota.c
-test_datacache_quota_postgres_LDADD = \
- libgnunetdatacache.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-EXTRA_DIST = \
- test_datacache_data_sqlite.conf \
- test_datacache_data_heap.conf \
- test_datacache_data_postgres.conf
diff --git a/src/service/datastore/Makefile.am b/src/service/datastore/Makefile.am
@@ -1,142 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfg_DATA = \
-  datastore.conf
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIBS = -lgcov
-endif
-
-
-lib_LTLIBRARIES = \
-  libgnunetdatastore.la
-
-libgnunetdatastore_la_SOURCES = \
-  datastore_api.c datastore.h
-libgnunetdatastore_la_LIBADD = \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-libgnunetdatastore_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 1:0:0
-
-libexec_PROGRAMS = \
- gnunet-service-datastore
-
-gnunet_service_datastore_SOURCES = \
- gnunet-service-datastore.c
-gnunet_service_datastore_LDADD = \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-if HAVE_SQLITE
-if HAVE_BENCHMARKS
-  SQLITE_BENCHMARKS = \
-   perf_datastore_api_sqlite
-endif
- SQLITE_TESTS = \
-  test_datastore_api_sqlite \
-  test_datastore_api_management_sqlite \
-  $(SQLITE_BENCHMARKS)
-endif
-if HAVE_POSTGRESQL
-if HAVE_BENCHMARKS
-  POSTGRES_BENCHMARKS = \
-   perf_datastore_api_postgres
-endif
- POSTGRES_TESTS = \
-  test_datastore_api_postgres \
-  test_datastore_api_management_postgres \
-  $(POSTGRES_BENCHMARKS)
-endif
-
-#check_PROGRAMS = \
-#  test_datastore_api_heap \
-#  test_datastore_api_management_heap \
-#  perf_datastore_api_heap \
-#  $(SQLITE_TESTS) \
-#  $(POSTGRES_TESTS)
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
- TESTS = $(check_PROGRAMS)
-endif
-
-test_datastore_api_heap_SOURCES = \
- test_datastore_api.c
-test_datastore_api_heap_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- libgnunetdatastore.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_datastore_api_management_heap_SOURCES = \
- test_datastore_api_management.c
-test_datastore_api_management_heap_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- libgnunetdatastore.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-perf_datastore_api_heap_SOURCES = \
- perf_datastore_api.c
-perf_datastore_api_heap_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- libgnunetdatastore.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_datastore_api_sqlite_SOURCES = \
- test_datastore_api.c
-test_datastore_api_sqlite_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- libgnunetdatastore.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_datastore_api_management_sqlite_SOURCES = \
- test_datastore_api_management.c
-test_datastore_api_management_sqlite_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- libgnunetdatastore.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-perf_datastore_api_sqlite_SOURCES = \
- perf_datastore_api.c
-perf_datastore_api_sqlite_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- libgnunetdatastore.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_datastore_api_postgres_SOURCES = \
- test_datastore_api.c
-test_datastore_api_postgres_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- libgnunetdatastore.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_datastore_api_management_postgres_SOURCES = \
- test_datastore_api_management.c
-test_datastore_api_management_postgres_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- libgnunetdatastore.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-perf_datastore_api_postgres_SOURCES = \
- perf_datastore_api.c
-perf_datastore_api_postgres_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- libgnunetdatastore.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-EXTRA_DIST = \
- test_defaults.conf \
- test_datastore_api_data_sqlite.conf \
- test_datastore_api_data_heap.conf \
- test_datastore_api_data_postgres.conf
diff --git a/src/service/dht/Makefile.am b/src/service/dht/Makefile.am
@@ -1,84 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfg_DATA = \
-  dht.conf
-
-dist_pkgcfg_DATA = \
-  dhtu.conf
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-lib_LTLIBRARIES = \
- libgnunetdht.la
-
-libgnunetdht_la_SOURCES = \
-  dht_api.c dht.h
-libgnunetdht_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(XLIB) \
-  $(LTLIBINTL)
-libgnunetdht_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 4:0:0
-
-
-libexec_PROGRAMS = \
- gnunet-service-dht
-
-UNDERLAY_PLUGINS = \
-  plugin_dhtu_gnunet.c plugin_dhtu_gnunet.h
-if LINUX
-UNDERLAY_PLUGINS += \
- plugin_dhtu_ip.c plugin_dhtu_ip.h
-endif
-
-gnunet_service_dht_SOURCES = \
- gnunet-service-dht.c gnunet-service-dht.h \
- dht_helper.c dht_helper.h \
- $(UNDERLAY_PLUGINS) \
- gnunet-service-dht_datacache.c gnunet-service-dht_datacache.h \
- gnunet-service-dht_neighbours.c gnunet-service-dht_neighbours.h \
- gnunet-service-dht_routing.c gnunet-service-dht_routing.h
-gnunet_service_dht_LDADD = \
-  libgnunetdht.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/service/core/libgnunetcore.la \
-  $(top_builddir)/src/service/nse/libgnunetnse.la \
-  $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
-  $(top_builddir)/src/lib/hello/libgnunethello.la \
-  $(top_builddir)/src/lib/block/libgnunetblock.la \
-  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
-  $(top_builddir)/src/service/transport/libgnunettransportapplication.la \
-  $(top_builddir)/src/service/datacache/libgnunetdatacache.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  -lm
-gnunet_service_dht_LDFLAGS = \
-  $(GN_LIBINTL)
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-endif
-
-test_dht_api_SOURCES = \
- test_dht_api.c
-test_dht_api_LDADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/hello/libgnunethello.la \
- libgnunetdht.la
-
-EXTRA_DIST = \
-  gnunet-service-dht_clients.c gnunet-service-dht_clients.h \
-  dhtu_testbed_connect.sh \
-  dhtu_testbed_deploy.conf \
-  dhtu_testbed_deploy.sh
diff --git a/src/service/dns/Makefile.am b/src/service/dns/Makefile.am
@@ -1,83 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-plugindir = $(libdir)/gnunet
-
-pkgcfg_DATA = \
-  dns.conf
-
-if LINUX
-HIJACKBIN = gnunet-helper-dns
-endif
-
-lib_LTLIBRARIES = \
-  libgnunetdns.la
-
-libexec_PROGRAMS = \
-  gnunet-service-dns $(HIJACKBIN)
-
-noinst_PROGRAMS = \
-  gnunet-dns-monitor \
-  gnunet-dns-redirector \
-  gnunet-zonewalk
-
-if LINUX
-check_SCRIPTS = \
- test_gnunet_dns.sh
-endif
-
-gnunet_helper_dns_SOURCES = \
- gnunet-helper-dns.c
-
-
-gnunet_dns_monitor_SOURCES = \
- gnunet-dns-monitor.c
-gnunet_dns_monitor_LDADD = \
-  libgnunetdns.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-gnunet_zonewalk_SOURCES = \
- gnunet-zonewalk.c
-gnunet_zonewalk_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-gnunet_dns_redirector_SOURCES = \
- gnunet-dns-redirector.c
-gnunet_dns_redirector_LDADD = \
-  libgnunetdns.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-gnunet_service_dns_SOURCES = \
- gnunet-service-dns.c
-gnunet_service_dns_LDADD = \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-libgnunetdns_la_SOURCES = \
- dns_api.c dns.h
-libgnunetdns_la_LIBADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIB)
-libgnunetdns_la_LDFLAGS = \
-  $(GN_LIBINTL) \
-  $(GN_LIB_LDFLAGS) \
-  -version-info 0:0:0
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = $(check_PROGRAMS)  $(check_SCRIPTS)
-endif
-
-EXTRA_DIST = \
-  $(check_SCRIPTS)
diff --git a/src/service/exit/Makefile.am b/src/service/exit/Makefile.am
@@ -1,38 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-plugindir = $(libdir)/gnunet
-
-dist_pkgcfg_DATA = \
-  exit.conf
-
-if LINUX
-EXITBIN = gnunet-helper-exit
-endif
-
-
-libexec_PROGRAMS = \
-  gnunet-daemon-exit \
-  $(EXITBIN)
-
-
-gnunet_helper_exit_SOURCES = \
-  gnunet-helper-exit.c
-
-gnunet_daemon_exit_SOURCES = \
- gnunet-daemon-exit.c exit.h
-gnunet_daemon_exit_LDADD = \
-  $(top_builddir)/src/service/dht/libgnunetdht.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/service/regex/libgnunetregex.la \
-  $(GN_LIBINTL)
diff --git a/src/service/fs/Makefile.am b/src/service/fs/Makefile.am
@@ -1,369 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfg_DATA = \
-  fs.conf
-
-lib_LTLIBRARIES = libgnunetfs.la
-
-libgnunetfs_la_SOURCES = \
-  fs_api.c fs_api.h fs.h \
-  fs_directory.c \
-  fs_dirmetascan.c \
-  fs_download.c \
-  fs_file_information.c \
-  fs_getopt.c \
-  fs_list_indexed.c \
-  fs_publish.c \
-  fs_publish_ksk.c \
-  fs_publish_ublock.c fs_publish_ublock.h \
-  fs_misc.c \
-  fs_namespace.c \
-  fs_search.c \
-  fs_sharetree.c \
-  fs_tree.c fs_tree.h \
-  fs_unindex.c \
-  fs_uri.c \
-  meta_data.c
-
-libgnunetfs_la_LIBADD = \
-  $(top_builddir)/src/service/datastore/libgnunetdatastore.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL) $(XLIB) $(LIBGCRYPT_LIBS) -lunistring
-
-if HAVE_LIBEXTRACTOR
-libgnunetfs_la_LIBADD += \
-  -lextractor
-endif
-
-libgnunetfs_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)   \
-  -version-info 3:1:1
-
-
-libexec_PROGRAMS = \
-  gnunet-helper-fs-publish \
-  gnunet-service-fs
-
-noinst_PROGRAMS = \
-  gnunet-daemon-fsprofiler
-
-gnunet_helper_fs_publish_SOURCES =  \
- gnunet-helper-fs-publish.c
-gnunet_helper_fs_publish_LDADD =  \
-  libgnunetfs.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-if HAVE_LIBEXTRACTOR
-gnunet_helper_fs_publish_LDADD += \
-  -lextractor
-endif
-
-gnunet_daemon_fsprofiler_SOURCES =  \
- gnunet-daemon-fsprofiler.c
-gnunet_daemon_fsprofiler_LDADD = \
-  libgnunetfs.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-gnunet_service_fs_SOURCES =  \
- gnunet-service-fs.c gnunet-service-fs.h \
- gnunet-service-fs_cp.c gnunet-service-fs_cp.h \
- gnunet-service-fs_indexing.c gnunet-service-fs_indexing.h \
- gnunet-service-fs_pe.c gnunet-service-fs_pe.h \
- gnunet-service-fs_pr.c gnunet-service-fs_pr.h \
- gnunet-service-fs_push.c gnunet-service-fs_push.h \
- gnunet-service-fs_put.c gnunet-service-fs_put.h \
- gnunet-service-fs_cadet_client.c gnunet-service-fs_cadet.h \
- gnunet-service-fs_cadet_server.c
-gnunet_service_fs_LDADD =  \
- libgnunetfs.la \
- $(top_builddir)/src/service/dht/libgnunetdht.la \
- $(top_builddir)/src/lib/block/libgnunetblock.la \
- $(top_builddir)/src/service/datastore/libgnunetdatastore.la \
- $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/service/cadet/libgnunetcadet.la \
- $(top_builddir)/src/service/core/libgnunetcore.la \
- $(top_builddir)/src/lib/hello/libgnunethello.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
- $(GN_LIBINTL) -lm
-
-# test_fs_download \
-# test_fs_download_cadet \
-# test_fs_download_indexed \
-# test_fs_download_persistence \
-# test_fs_publish \
-# test_fs_list_indexed \
-# test_fs_namespace \
-# test_fs_namespace_list_updateable \
-# test_fs_search \
-# test_fs_search_with_and \
-# test_fs_search_probes \
-# test_fs_search_persistence \
-# test_fs_publish_persistence \
-# test_fs_unindex \
-# test_fs_start_stop \
-# test_fs_unindex_persistence
-
-
-check_PROGRAMS = \
- test_fs_directory \
- test_fs_file_information \
- test_fs_getopt \
- test_fs_uri \
- test_fs_meta_data \
- $(FS_BENCHMARKS)
-# test_gnunet_service_fs_migration
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = $(check_PROGRAMS)
-endif
-
-
-test_fs_directory_SOURCES = \
- test_fs_directory.c
-test_fs_directory_LDADD = \
-  libgnunetfs.la  \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-if HAVE_LIBEXTRACTOR
-test_fs_directory_LDADD += \
-  -lextractor
-endif
-
-
-test_fs_download_SOURCES = \
- test_fs_download.c
-test_fs_download_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la  \
-  libgnunetfs.la  \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_fs_download_indexed_SOURCES = \
- test_fs_download.c
-test_fs_download_indexed_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la  \
-  libgnunetfs.la  \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_fs_download_cadet_SOURCES = \
- test_fs_download.c
-test_fs_download_cadet_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la  \
-  libgnunetfs.la  \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_fs_download_persistence_SOURCES = \
- test_fs_download_persistence.c
-test_fs_download_persistence_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la  \
-  libgnunetfs.la  \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_fs_file_information_SOURCES = \
- test_fs_file_information.c
-test_fs_file_information_LDADD = \
-  libgnunetfs.la  \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-if HAVE_LIBEXTRACTOR
-test_fs_file_information_LDADD += \
-  -lextractor
-endif
-
-
-test_fs_getopt_SOURCES = \
- test_fs_getopt.c
-test_fs_getopt_LDADD = \
-  libgnunetfs.la  \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_fs_list_indexed_SOURCES = \
- test_fs_list_indexed.c
-test_fs_list_indexed_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  libgnunetfs.la  \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_fs_namespace_SOURCES = \
- test_fs_namespace.c
-test_fs_namespace_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  libgnunetfs.la  \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_fs_namespace_list_updateable_SOURCES = \
- test_fs_namespace_list_updateable.c
-test_fs_namespace_list_updateable_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  libgnunetfs.la  \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_fs_publish_SOURCES = \
- test_fs_publish.c
-test_fs_publish_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  libgnunetfs.la  \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_fs_publish_persistence_SOURCES = \
- test_fs_publish_persistence.c
-test_fs_publish_persistence_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  libgnunetfs.la  \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_fs_search_SOURCES = \
- test_fs_search.c
-test_fs_search_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  libgnunetfs.la	\
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_fs_search_with_and_SOURCES = \
- test_fs_search_with_and.c
-test_fs_search_with_and_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  libgnunetfs.la	\
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_fs_search_probes_SOURCES = \
- test_fs_search_probes.c
-test_fs_search_probes_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  libgnunetfs.la	\
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_fs_search_persistence_SOURCES = \
- test_fs_search_persistence.c
-test_fs_search_persistence_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  libgnunetfs.la	\
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_fs_start_stop_SOURCES = \
- test_fs_start_stop.c
-test_fs_start_stop_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  libgnunetfs.la  \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_fs_unindex_SOURCES = \
- test_fs_unindex.c
-test_fs_unindex_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  libgnunetfs.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_fs_unindex_persistence_SOURCES = \
- test_fs_unindex_persistence.c
-test_fs_unindex_persistence_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  libgnunetfs.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_fs_meta_data_SOURCES = \
- test_fs_meta_data.c
-test_fs_meta_data_LDADD = \
- libgnunetfs.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-
-test_fs_uri_SOURCES = \
- test_fs_uri.c
-test_fs_uri_LDADD = \
-  libgnunetfs.la  \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-# TNG
-
-#test_gnunet_service_fs_p2p_SOURCES = \
-# test_gnunet_service_fs_p2p.c
-#test_gnunet_service_fs_p2p_LDADD = \
-#  libgnunetfstest.a \
-#  $(top_builddir)/src/testbed/libgnunettestbed.la \
-#  libgnunetfs.la  \
-#  $(top_builddir)/src/lib/util/libgnunetutil.la
-#
-#test_gnunet_service_fs_p2p_cadet_SOURCES = \
-# test_gnunet_service_fs_p2p.c
-#test_gnunet_service_fs_p2p_cadet_LDADD = \
-#  libgnunetfstest.a \
-#  $(top_builddir)/src/testbed/libgnunettestbed.la \
-#  libgnunetfs.la  \
-#  $(top_builddir)/src/lib/util/libgnunetutil.la
-#
-#test_gnunet_service_fs_migration_SOURCES = \
-# test_gnunet_service_fs_migration.c
-#test_gnunet_service_fs_migration_LDADD = \
-#  libgnunetfstest.a \
-#  $(top_builddir)/src/testbed/libgnunettestbed.la \
-#  libgnunetfs.la  \
-#  $(top_builddir)/src/lib/util/libgnunetutil.la
-#
-#perf_gnunet_service_fs_p2p_SOURCES = \
-# perf_gnunet_service_fs_p2p.c
-#perf_gnunet_service_fs_p2p_LDADD = \
-#  libgnunetfstest.a \
-#  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-#  $(top_builddir)/src/testbed/libgnunettestbed.la \
-#  libgnunetfs.la  \
-#  $(top_builddir)/src/lib/util/libgnunetutil.la
-#
-#perf_gnunet_service_fs_p2p_index_SOURCES = \
-# perf_gnunet_service_fs_p2p.c
-#perf_gnunet_service_fs_p2p_index_LDADD = \
-#  libgnunetfstest.a \
-#  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-#  $(top_builddir)/src/testbed/libgnunettestbed.la \
-#  libgnunetfs.la  \
-#  $(top_builddir)/src/lib/util/libgnunetutil.la
-#
-#perf_gnunet_service_fs_p2p_dht_SOURCES = \
-# perf_gnunet_service_fs_p2p.c
-#perf_gnunet_service_fs_p2p_dht_LDADD = \
-#  libgnunetfstest.a \
-#  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-#  $(top_builddir)/src/testbed/libgnunettestbed.la \
-#  libgnunetfs.la  \
-#  $(top_builddir)/src/lib/util/libgnunetutil.la
-#
-#perf_gnunet_service_fs_p2p_respect_SOURCES = \
-# perf_gnunet_service_fs_p2p_respect.c
-#perf_gnunet_service_fs_p2p_respect_LDADD = \
-#  libgnunetfstest.a \
-#  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-#  $(top_builddir)/src/testbed/libgnunettestbed.la \
-#  libgnunetfs.la  \
-#  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-EXTRA_DIST = \
-  perf_gnunet_service_fs_p2p.conf \
-  test_fs_data.conf \
-  test_fs_defaults.conf \
-  test_fs_download_data.conf \
-  test_fs_download_indexed.conf \
-  test_fs_file_information_data.conf \
-  test_fs_list_indexed_data.conf \
-  test_fs_namespace_data.conf \
-  test_fs_publish_data.conf \
-  test_fs_search_data.conf \
-  test_fs_unindex_data.conf \
-  test_gnunet_fs_rec_data.tgz \
-  test_gnunet_service_fs_migration_data.conf \
-  test_gnunet_service_fs_p2p_cadet.conf \
-  test_pseudonym_data.conf
diff --git a/src/service/gns/Makefile.am b/src/service/gns/Makefile.am
@@ -1,180 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if HAVE_GLIBCNSS
-NSS_SUBDIR = nss
-endif
-
-SUBDIRS = . $(NSS_SUBDIR)
-
-if HAVE_LIBIDN
-  LIBIDN= -lidn
-else
-  LIBIDN=
-endif
-
-if HAVE_LIBIDN2
-  LIBIDN2= -lidn2
-else
-  LIBIDN2=
-endif
-
-USE_VPN = $(top_builddir)/src/service/vpn/libgnunetvpn.la
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-endif
-
-pkgcfgdir = $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-plugindir = $(libdir)/gnunet
-
-pkgcfg_DATA = \
-  gns.conf
-dist_pkgcfg_DATA = \
-  tlds.conf
-
-lib_LTLIBRARIES = \
-  libgnunetgns.la
-
-libexec_PROGRAMS = \
-  gnunet-service-gns \
-  gnunet-dns2gns
-
-noinst_PROGRAMS = \
-  gnunet-gns-benchmark
-
-if HAVE_PDFLATEX
-libexec_PROGRAMS += gnunet-bcd
-endif
-
-if HAVE_GNUTLS
-libexec_PROGRAMS += gnunet-gns-proxy
-endif
-
-gnunet_gns_benchmark_SOURCES = \
- gnunet-gns-benchmark.c
-gnunet_gns_benchmark_LDADD = \
-  libgnunetgns.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-
-gnunet_bcd_SOURCES = \
- gnunet-bcd.c
-gnunet_bcd_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(GN_LIBINTL) $(MHD_LIBS)
-gnunet_bcd_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
-
-
-gnunet_dns2gns_SOURCES = \
- gnunet-dns2gns.c
-gnunet_dns2gns_LDADD = \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetgns.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(USE_VPN) \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(GN_LIBINTL)
-
-if HAVE_SUDO
-SUDO_OR_DOAS_BINARY= $(SUDO_BINARY) -n
-else
-if HAVE_DOAS_BINARY
-SUDO_OR_DOAS_BINARY= $(DOAS_BINARY)
-endif
-endif
-
-if LINUX
-HIJACKBIN = gnunet-dns2gns
-install-exec-hook:
-	$(SUDO_OR_DOAS_BINARY) setcap 'cap_net_bind_service=+ep' $(DESTDIR)$(libexecdir)/gnunet-dns2gns || true
-else
-install-exec-hook:
-endif
-
-gnunet_gns_proxy_SOURCES = \
- gnunet-gns-proxy.c
-gnunet_gns_proxy_LDADD = $(MHD_LIBS) @LIBCURL@ -lgnutls \
-  libgnunetgns.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-if HAVE_GNUTLS_DANE
-gnunet_gns_proxy_LDADD += -lgnutls-dane
-endif
-gnunet_gns_proxy_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
-
-test_gns_proxy_SOURCES = \
-  test_gns_proxy.c
-test_gns_proxy_LDADD = $(MHD_LIBS) @LIBCURL@ -lgnutls \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-test_gns_proxy_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
-
-#gnunet_gns_import_SOURCES = \
-#  gnunet-gns-import.c
-#gnunet_gns_import_LDADD = \
-#  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-#  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-#  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-#  $(top_builddir)/src/lib/util/libgnunetutil.la \
-#  $(GN_LIBINTL)
-
-
-gnunet_service_gns_SOURCES = \
- gnunet-service-gns.c gnunet-service-gns.h \
- gnunet-service-gns_resolver.c gnunet-service-gns_resolver.h \
- gnunet-service-gns_interceptor.c gnunet-service-gns_interceptor.h
-gnunet_service_gns_LDADD = \
-  -lm \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/revocation/libgnunetrevocation.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/dns/libgnunetdns.la \
-  $(top_builddir)/src/service/dht/libgnunetdht.la \
-  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
-  $(LIBIDN) $(LIBIDN2) \
-  $(GN_LIBINTL)
-
-
-libgnunetgns_la_SOURCES = \
- gns_api.c gns_api.h \
- gns_tld_api.c gns.h
-libgnunetgns_la_LIBADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIB) \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la
-libgnunetgns_la_LDFLAGS = \
-  $(GN_LIBINTL) \
-  $(GN_LIB_LDFLAGS)
-
-
-if HAVE_GNUTLS
-check_PROGRAMS = \
-  test_gns_proxy
-endif
-
-if HAVE_GNUTLS_CURL
-check_SCRIPTS = \
-  test_proxy.sh
-endif
-
-EXTRA_DIST = \
-  test_gns_proxy.conf \
-  test_proxy.sh
-
-if ENABLE_TEST_RUN
-if HAVE_SQLITE
- AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
- TESTS = $(check_SCRIPTS)
-endif
-endif
diff --git a/src/service/gns/nss/Makefile.am b/src/service/gns/nss/Makefile.am
@@ -1,43 +0,0 @@
-# This Makefile.am is in the public domain
-# $Id$
-#
-# This file taken and modified from nss-gns.
-#
-# nss-gns 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 3 of the
-# License, or (at your option) any later version.
-#
-# nss-gns is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with nss-gns; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-# USA.
-
-EXTRA_DIST = map-file
-
-AM_LDFLAGS=-avoid-version -module -export-dynamic
-
-lib_LTLIBRARIES = \
-	libnss_gns.la \
-	libnss_gns4.la \
-	libnss_gns6.la
-
-sources = nss_gns_query.h nss_gns_query.c
-
-# GNU Libc
-libnss_gns_la_SOURCES= $(sources) nss_gns.c
-libnss_gns_la_CFLAGS=$(AM_CFLAGS) -D_GNU_SOURCE
-libnss_gns_la_LDFLAGS=$(AM_LDFLAGS) -shrext .so.2 -Wl,-version-script=$(srcdir)/map-file
-
-libnss_gns4_la_SOURCES=$(libnss_gns_la_SOURCES)
-libnss_gns4_la_CFLAGS=$(libnss_gns_la_CFLAGS) -DNSS_IPV4_ONLY=1
-libnss_gns4_la_LDFLAGS=$(libnss_gns_la_LDFLAGS)
-
-libnss_gns6_la_SOURCES=$(libnss_gns_la_SOURCES)
-libnss_gns6_la_CFLAGS=$(libnss_gns_la_CFLAGS) -DNSS_IPV6_ONLY=1
-libnss_gns6_la_LDFLAGS=$(libnss_gns_la_LDFLAGS)
diff --git a/src/service/hostlist/Makefile.am b/src/service/hostlist/Makefile.am
@@ -1,83 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-endif
-
- HOSTLIST_SERVER_SOURCES = \
-   gnunet-daemon-hostlist_server.c gnunet-daemon-hostlist_server.h
- GN_LIBMHD = $(MHD_LIBS)
- GN_CPPMHD = $(MHD_CFLAGS)
-
-libexec_PROGRAMS = \
- gnunet-daemon-hostlist
-dist_pkgcfg_DATA = \
-  hostlist.conf
-
-gnunet_daemon_hostlist_SOURCES = \
- gnunet-daemon-hostlist.c gnunet-daemon-hostlist.h \
- gnunet-daemon-hostlist_client.c gnunet-daemon-hostlist_client.h \
- $(HOSTLIST_SERVER_SOURCES)
-
-gnunet_daemon_hostlist_LDADD = \
-  $(top_builddir)/src/service/core/libgnunetcore.la \
-  $(top_builddir)/src/lib/hello/libgnunethello.la \
-  $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBMHD) \
-  -ljansson \
-  @LIBCURL@ \
-  $(GN_LIBINTL)
-
-gnunet_daemon_hostlist_CFLAGS = \
-  $(GN_CPPMHD) \
-  @LIBCURL_CPPFLAGS@ \
-  $(AM_CFLAGS)
-
-#check_PROGRAMS = \
-# test_gnunet_daemon_hostlist \
-# test_gnunet_daemon_hostlist_reconnect \
-# test_gnunet_daemon_hostlist_learning
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = \
- $(check_PROGRAMS)
-endif
-
-#test_gnunet_daemon_hostlist_SOURCES = \
-# test_gnunet_daemon_hostlist.c
-#test_gnunet_daemon_hostlist_LDADD = \
-#  $(top_builddir)/src/service/transport/libgnunettransport.la \
-#  $(top_builddir)/src/lib/util/libgnunetutil.la
-#
-#test_gnunet_daemon_hostlist_reconnect_SOURCES = \
-# test_gnunet_daemon_hostlist_reconnect.c
-#test_gnunet_daemon_hostlist_reconnect_LDADD = \
-#  $(top_builddir)/src/service/transport/libgnunettransport.la \
-#  $(top_builddir)/src/lib/util/libgnunetutil.la
-#
-#test_gnunet_daemon_hostlist_learning_SOURCES = \
-# test_gnunet_daemon_hostlist_learning.c
-#test_gnunet_daemon_hostlist_learning_LDADD = \
-#  $(top_builddir)/src/service/transport/libgnunettransport.la \
-#  $(top_builddir)/src/service/core/libgnunetcore.la \
-#  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-#  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-EXTRA_DIST = \
-  test_hostlist_defaults.conf \
-  test_gnunet_daemon_hostlist_data.conf \
-  test_gnunet_daemon_hostlist_peer1.conf \
-  test_gnunet_daemon_hostlist_peer2.conf \
-  test_learning_adv_peer.conf \
-  test_learning_learn_peer.conf \
-  test_learning_learn_peer2.conf \
-  learning_data.conf
diff --git a/src/service/identity/Makefile.am b/src/service/identity/Makefile.am
@@ -1,64 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfg_DATA = \
-  identity.conf
-
-lib_LTLIBRARIES = \
-  libgnunetidentity.la
-
-
-libgnunetidentity_la_SOURCES = \
-  identity_api.c \
-  identity_api_lookup.c \
-  identity_api_suffix_lookup.c \
-  identity.h
-libgnunetidentity_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL) $(XLIB)
-libgnunetidentity_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)   \
-  -lsodium \
-  -version-info 1:0:0
-
-libexec_PROGRAMS = \
- gnunet-service-identity
-
-gnunet_service_identity_SOURCES = \
- gnunet-service-identity.c
-gnunet_service_identity_LDADD = \
-  libgnunetidentity.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-
-#check_PROGRAMS = \
-# test_identity
-
-# if ENABLE_TEST_RUN
-# AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-# TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
-# endif
-
-
-test_identity_SOURCES = \
- test_identity.c
-test_identity_LDADD = \
-  libgnunetidentity.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-EXTRA_DIST = \
-  test_identity.conf
diff --git a/src/service/messenger/Makefile.am b/src/service/messenger/Makefile.am
@@ -1,165 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfg_DATA = \
-  messenger.conf
-
-plugindir = $(libdir)/gnunet
-
-AM_CLFAGS = -g
-
-libexec_PROGRAMS = \
- gnunet-service-messenger \
- $(EXP_LIBEXEC)
-
-#plugin_LTLIBRARIES = \
-#  libgnunet_test_messenger_plugin_cmd_simple_join.la
-
-lib_LTLIBRARIES = \
-  libgnunetmessenger.la \
-  $(EXP_LIB)
-#  libgnunettestingmessenger.la
-
-libgnunetmessenger_la_SOURCES = \
-  messenger_api.c messenger_api.h \
-  messenger_api_contact.c messenger_api_contact.h \
-  messenger_api_contact_store.c messenger_api_contact_store.h \
-  messenger_api_epoch.c messenger_api_epoch.h \
-  messenger_api_epoch_announcement.c messenger_api_epoch_announcement.h \
-  messenger_api_epoch_group.c messenger_api_epoch_group.h \
-  messenger_api_epoch_membership.c messenger_api_epoch_membership.h \
-  messenger_api_message.c messenger_api_message.h \
-  messenger_api_message_control.c messenger_api_message_control.h \
-  messenger_api_message_kind.c messenger_api_message_kind.h \
-  messenger_api_list_tunnels.c messenger_api_list_tunnels.h \
-  messenger_api_queue_messages.c messenger_api_queue_messages.h \
-  messenger_api_util.c messenger_api_util.h \
-  messenger_api_handle.c messenger_api_handle.h \
-  messenger_api_room.c messenger_api_room.h
-libgnunetmessenger_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(XLIB) \
-  $(LTLIBINTL)
-libgnunetmessenger_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 0:0:0
-
-libgnunettestingmessenger_la_SOURCES = \
-  testing_messenger_cmd_join_room.c \
-  testing_messenger_cmd_start_service.c \
-  testing_messenger_cmd_stop_service.c \
-  testing_messenger_traits.c \
-  testing_messenger.c testing_messenger.h
-libgnunettestingmessenger_la_LIBADD = \
-  libgnunetmessenger.la \
-  $(top_builddir)/src/lib/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/service/transport/libgnunettestingtransporttesting.la \
-  $(top_builddir)/src/service/transport/libgnunettransportapplication.la \
-  $(top_builddir)/src/service/transport/libgnunettransportcore.la \
-  $(top_builddir)/src/service/core/libgnunetcore.la \
-  $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/arm/libgnunetarm.la \
-  $(top_builddir)/src/lib/hello/libgnunethello.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-libgnunetmessengertesting_la_LDFLAGS = \
-  $(GN_LIBINTL) \
-  $(GN_LIB_LDFLAGS) \
-  -version-info 0:0:0
-
-libgnunet_test_messenger_plugin_cmd_simple_join_la_SOURCES = \
-  messenger-testing-cmds.h \
-  test_messenger_plugin_cmd_simple_join.c
-libgnunet_test_messenger_plugin_cmd_simple_join_la_LIBADD = \
-  libgnunetmessenger.la \
-  libgnunettestingmessenger.la \
-  $(top_builddir)/src/service/core/libgnunettestingcore.la \
-  $(top_builddir)/src/service/transport/libgnunettestingtransport.la \
-  $(top_builddir)/src/lib/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/service/core/libgnunetcore.la \
-  $(top_builddir)/src/service/transport/libgnunettransportapplication.la \
-  $(top_builddir)/src/service/transport/libgnunettransportcore.la \
-  $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/hello/libgnunethello.la \
-  $(top_builddir)/src/service/arm/libgnunetarm.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_test_messenger_plugin_cmd_simple_join_la_LDFLAGS = \
-  $(GN_PLUGIN_LDFLAGS)
-
-gnunet_service_messenger_SOURCES = \
-  gnunet-service-messenger.c gnunet-service-messenger.h \
-  gnunet-service-messenger_service.c gnunet-service-messenger_service.h \
-  gnunet-service-messenger_list_handles.c gnunet-service-messenger_list_handles.h \
-  gnunet-service-messenger_list_messages.c gnunet-service-messenger_list_messages.h \
-  gnunet-service-messenger_member_session.c gnunet-service-messenger_member_session.h \
-  gnunet-service-messenger_sender_session.h \
-  gnunet-service-messenger_member.c gnunet-service-messenger_member.h \
-  gnunet-service-messenger_member_store.c gnunet-service-messenger_member_store.h \
-  gnunet-service-messenger_message_handle.c gnunet-service-messenger_message_handle.h \
-  gnunet-service-messenger_message_kind.c gnunet-service-messenger_message_kind.h \
-  gnunet-service-messenger_message_recv.c gnunet-service-messenger_message_recv.h \
-  gnunet-service-messenger_message_send.c gnunet-service-messenger_message_send.h \
-  gnunet-service-messenger_message_state.c gnunet-service-messenger_message_state.h \
-  gnunet-service-messenger_message_store.c gnunet-service-messenger_message_store.h \
-  gnunet-service-messenger_operation_store.c gnunet-service-messenger_operation_store.h \
-  gnunet-service-messenger_operation.c gnunet-service-messenger_operation.h \
-  gnunet-service-messenger_peer_store.c gnunet-service-messenger_peer_store.h \
-  gnunet-service-messenger_subscription.c gnunet-service-messenger_subscription.h \
-  gnunet-service-messenger_basement.c gnunet-service-messenger_basement.h \
-  gnunet-service-messenger_handle.c gnunet-service-messenger_handle.h \
-  gnunet-service-messenger_room.c gnunet-service-messenger_room.h \
-  gnunet-service-messenger_tunnel.c gnunet-service-messenger_tunnel.h
-gnunet_service_messenger_LDADD = \
-  libgnunetmessenger.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(GN_LIBINTL)
-
-#check_PROGRAMS = \
-#  test_messenger_api \
-#  test_messenger_anonymous
-
-#check_SCRIPTS= \
-#  test_messenger_start_testcase.sh
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = $(check_PROGRAMS) \
-  $(check_SCRIPTS)
-endif
-
-test_messenger_api_SOURCES = \
-  test_messenger.c
-test_messenger_api_LDADD = \
-  libgnunetmessenger.la \
-  $(top_builddir)/src/lib/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_messenger_anonymous_SOURCES = \
-  test_messenger_anonymous.c
-test_messenger_anonymous_LDADD = \
-  libgnunetmessenger.la \
-  $(top_builddir)/src/lib/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-EXTRA_DIST = \
-  test_messenger_start_testcase.sh \
-  test_messenger_api.conf
diff --git a/src/service/namecache/Makefile.am b/src/service/namecache/Makefile.am
@@ -1,76 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include $(POSTGRESQL_CPPFLAGS)
-
-plugindir = $(libdir)/gnunet
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfg_DATA = \
-   namecache.conf
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIBS = -lgcov
-endif
-
-# testcases do not even build yet; thus: experimental!
-TESTING_TESTS = \
- test_namecache_api_cache_block
-
-if HAVE_SQLITE
-#check_PROGRAMS = \
-# $(TESTING_TESTS)
-endif
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = \
-  $(check_PROGRAMS)
-endif
-
-lib_LTLIBRARIES = \
-  libgnunetnamecache.la
-
-
-libgnunetnamecache_la_SOURCES = \
-  namecache_api.c \
-  namecache.h
-libgnunetnamecache_la_LIBADD = \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-libgnunetnamecache_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 0:0:0
-
-
-libexec_PROGRAMS = \
- gnunet-service-namecache
-
-gnunet_service_namecache_SOURCES = \
- gnunet-service-namecache.c
-
-gnunet_service_namecache_LDADD = \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  libgnunetnamecache.la \
-  $(GN_LIBINTL)
-
-
-test_namecache_api_cache_block_SOURCES = \
- test_namecache_api_cache_block.c
-test_namecache_api_cache_block_LDADD = \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  libgnunetnamecache.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-
-EXTRA_DIST = \
-  test_namecache_api.conf
diff --git a/src/service/namestore/Makefile.am b/src/service/namestore/Makefile.am
@@ -1,383 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include $(POSTGRESQL_CPPFLAGS)
-
-plugindir = $(libdir)/gnunet
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfg_DATA = \
-   namestore.conf
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIBS = -lgcov
-endif
-
-lib_LTLIBRARIES = \
-  libgnunetnamestore.la
-
-libexec_PROGRAMS = \
- gnunet-service-namestore
-
-libgnunetnamestore_la_SOURCES = \
-  namestore_api.c \
-  namestore_api_monitor.c \
-  namestore.h
-libgnunetnamestore_la_LIBADD = \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la  \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-libgnunetnamestore_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 0:1:0
-
-gnunet_service_namestore_SOURCES = \
- gnunet-service-namestore.c
-gnunet_service_namestore_LDADD = \
-  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  libgnunetnamestore.la \
-  $(GN_LIBINTL)
-
-if HAVE_SQLITE
-SQLITE_TESTS = \
- test_namestore_api_store_sqlite \
- test_namestore_api_store_update_sqlite \
- test_namestore_api_zone_iteration_sqlite \
- test_namestore_api_remove_sqlite \
- test_namestore_api_lookup_nick_sqlite \
- test_namestore_api_monitoring_sqlite \
- test_namestore_api_remove_not_existing_record_sqlite \
- test_namestore_api_zone_iteration_nick_sqlite \
- test_namestore_api_zone_iteration_specific_zone_sqlite \
- test_namestore_api_zone_iteration_stop_sqlite \
- test_namestore_api_monitoring_existing_sqlite \
- test_namestore_api_zone_to_name_sqlite \
- test_namestore_api_edit_records_sqlite \
- perf_namestore_api_zone_iteration_sqlite \
- perf_namestore_api_import_sqlite \
- perf_namestore_api_import_postgres
-endif
-
-
-if HAVE_POSTGRESQL
-POSTGRES_TESTS = \
- test_namestore_api_store_postgres \
- test_namestore_api_store_update_postgres \
- test_namestore_api_remove_postgres \
- test_namestore_api_zone_iteration_postgres \
- test_namestore_api_lookup_nick_postgres \
- test_namestore_api_monitoring_postgres \
- test_namestore_api_remove_not_existing_record_postgres \
- test_namestore_api_zone_iteration_nick_postgres \
- test_namestore_api_zone_iteration_specific_zone_postgres \
- test_namestore_api_zone_iteration_stop_postgres \
- test_namestore_api_monitoring_existing_postgres \
- test_namestore_api_zone_to_name_postgres \
- perf_namestore_api_zone_iteration_postgres
-if HAVE_EXPERIMENTAL
-POSTGRES_TESTS += test_namestore_api_edit_records_postgres
-endif
-endif
-
-#check_PROGRAMS = \
-# $(SQLITE_TESTS) \
-# $(POSTGRES_TESTS)
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = \
-  $(check_PROGRAMS) \
-  $(check_SCRIPTS)
-endif
-
-test_namestore_api_store_sqlite_SOURCES = \
- test_namestore_api_store.c
-test_namestore_api_store_sqlite_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_store_postgres_SOURCES = \
- test_namestore_api_store.c
-test_namestore_api_store_postgres_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_store_update_sqlite_SOURCES = \
- test_namestore_api_store_update.c
-test_namestore_api_store_update_sqlite_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_store_update_postgres_SOURCES = \
- test_namestore_api_store_update.c
-test_namestore_api_store_update_postgres_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_lookup_nick_sqlite_SOURCES = \
- test_namestore_api_lookup_nick.c
-test_namestore_api_lookup_nick_sqlite_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_lookup_nick_postgres_SOURCES = \
- test_namestore_api_lookup_nick.c
-test_namestore_api_lookup_nick_postgres_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_remove_sqlite_SOURCES = \
- test_namestore_api_remove.c
-test_namestore_api_remove_sqlite_LDADD = \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_remove_postgres_SOURCES = \
- test_namestore_api_remove.c
-test_namestore_api_remove_postgres_LDADD = \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_remove_not_existing_record_sqlite_SOURCES = \
- test_namestore_api_remove_not_existing_record.c
-test_namestore_api_remove_not_existing_record_sqlite_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_remove_not_existing_record_postgres_SOURCES = \
- test_namestore_api_remove_not_existing_record.c
-test_namestore_api_remove_not_existing_record_postgres_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_zone_to_name_sqlite_SOURCES = \
- test_namestore_api_zone_to_name.c
-test_namestore_api_zone_to_name_sqlite_LDADD = \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_zone_to_name_postgres_SOURCES = \
- test_namestore_api_zone_to_name.c
-test_namestore_api_zone_to_name_postgres_LDADD = \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_monitoring_sqlite_SOURCES = \
- test_namestore_api_monitoring.c
-test_namestore_api_monitoring_sqlite_LDADD = \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_namestore_api_monitoring_postgres_SOURCES = \
- test_namestore_api_monitoring.c
-test_namestore_api_monitoring_postgres_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_namestore_api_monitoring_existing_sqlite_SOURCES = \
- test_namestore_api_monitoring_existing.c
-test_namestore_api_monitoring_existing_sqlite_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_namestore_api_monitoring_existing_postgres_SOURCES = \
- test_namestore_api_monitoring_existing.c
-test_namestore_api_monitoring_existing_postgres_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-if HAVE_EXPERIMENTAL
-test_namestore_api_edit_records_postgres_SOURCES = \
- test_namestore_api_edit_records.c
-test_namestore_api_edit_records_postgres_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-endif
-
-test_namestore_api_edit_records_sqlite_SOURCES = \
- test_namestore_api_edit_records.c
-test_namestore_api_edit_records_sqlite_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_namestore_api_zone_iteration_sqlite_SOURCES = \
- test_namestore_api_zone_iteration.c
-test_namestore_api_zone_iteration_sqlite_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_zone_iteration_postgres_SOURCES = \
- test_namestore_api_zone_iteration.c
-test_namestore_api_zone_iteration_postgres_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-perf_namestore_api_zone_iteration_postgres_SOURCES = \
- perf_namestore_api_zone_iteration.c
-perf_namestore_api_zone_iteration_postgres_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-perf_namestore_api_import_sqlite_SOURCES = \
- perf_namestore_api_import.c
-perf_namestore_api_import_sqlite_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-perf_namestore_api_import_postgres_SOURCES = \
- perf_namestore_api_import.c
-perf_namestore_api_import_postgres_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-
-perf_namestore_api_zone_iteration_sqlite_SOURCES = \
- perf_namestore_api_zone_iteration.c
-perf_namestore_api_zone_iteration_sqlite_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_zone_iteration_nick_sqlite_SOURCES = \
- test_namestore_api_zone_iteration_nick.c
-test_namestore_api_zone_iteration_nick_sqlite_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_zone_iteration_nick_postgres_SOURCES = \
- test_namestore_api_zone_iteration_nick.c
-test_namestore_api_zone_iteration_nick_postgres_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_zone_iteration_specific_zone_sqlite_SOURCES = \
- test_namestore_api_zone_iteration_specific_zone.c
-test_namestore_api_zone_iteration_specific_zone_sqlite_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_zone_iteration_specific_zone_postgres_SOURCES = \
- test_namestore_api_zone_iteration_specific_zone.c
-test_namestore_api_zone_iteration_specific_zone_postgres_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_zone_iteration_stop_sqlite_SOURCES = \
- test_namestore_api_zone_iteration_stop.c
-test_namestore_api_zone_iteration_stop_sqlite_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_zone_iteration_stop_postgres_SOURCES = \
- test_namestore_api_zone_iteration_stop.c
-test_namestore_api_zone_iteration_stop_postgres_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-
-EXTRA_DIST = \
-  test_common.c \
-  test_namestore_api.conf \
-  test_namestore_api_postgres.conf \
-  test_namestore_api_sqlite.conf \
-  perf_namestore_api_postgres.conf \
-  perf_namestore_api_sqlite.conf
diff --git a/src/service/nat-auto/Makefile.am b/src/service/nat-auto/Makefile.am
@@ -1,40 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-pkgcfg_DATA = \
-  nat-auto.conf
-
-libexec_PROGRAMS = \
- gnunet-service-nat-auto
-
-if USE_COVERAGE
-  AM_CFLAGS = -fprofile-arcs -ftest-coverage
-endif
-
-lib_LTLIBRARIES = \
-  libgnunetnatauto.la
-
-libgnunetnatauto_la_SOURCES = \
-  nat_auto_api.c \
-  nat_auto_api_test.c
-libgnunetnatauto_la_LIBADD = \
-  $(top_builddir)/src/service/nat/libgnunetnatnew.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL) @EXT_LIBS@
-libgnunetnatauto_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 0:0:0
-
-gnunet_service_nat_auto_SOURCES = \
- gnunet-service-nat-auto.c nat-auto.h
-gnunet_service_nat_auto_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/service/nat/libgnunetnatnew.la \
-  $(LIBGCRYPT_LIBS) \
-  -lgcrypt \
-  $(GN_LIBINTL)
diff --git a/src/service/nat/Makefile.am b/src/service/nat/Makefile.am
@@ -1,106 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-pkgcfg_DATA = \
-  nat.conf
-
-if LINUX
-  NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client
-  NATSERVER = gnunet-helper-nat-server.c
-  NATCLIENT = gnunet-helper-nat-client.c
-else
-if XFREEBSD
-  NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client
-  NATSERVER = gnunet-helper-nat-server.c
-  NATCLIENT = gnunet-helper-nat-client.c
-endif
-else
-install-exec-hook:
-endif
-
-libexec_PROGRAMS = \
- $(NATBIN) \
- gnunet-service-nat
-
-
-gnunet_helper_nat_server_SOURCES = \
- $(NATSERVER)
-
-gnunet_helper_nat_client_SOURCES = \
- $(NATCLIENT)
-
-
-if USE_COVERAGE
-  AM_CFLAGS = -fprofile-arcs -ftest-coverage
-endif
-
-lib_LTLIBRARIES = \
-  libgnunetnatnew.la
-
-libgnunetnatnew_la_SOURCES = \
-  nat_api.c \
-  nat_api_stun.c nat_stun.h \
-  nat.h
-libgnunetnatnew_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL) @EXT_LIBS@
-libgnunetnatnew_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 2:0:0
-
-gnunet_service_nat_SOURCES = \
- gnunet-service-nat.c gnunet-service-nat.h \
- gnunet-service-nat_externalip.c gnunet-service-nat_externalip.h \
- gnunet-service-nat_stun.c gnunet-service-nat_stun.h \
- gnunet-service-nat_mini.c gnunet-service-nat_mini.h \
- gnunet-service-nat_helper.c gnunet-service-nat_helper.h
-gnunet_service_nat_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(LIBGCRYPT_LIBS) \
-  -lgcrypt \
-  $(GN_LIBINTL)
-
-#check_PROGRAMS = \
-#  test_nat \
-#  test_nat_mini \
-#  test_nat_test \
-#  test_stun
-
-if ENABLE_TEST_RUN
- AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
- TESTS = $(check_PROGRAMS)
-endif
-
-#test_nat_SOURCES = \
-#  test_nat.c
-#test_nat_LDADD = \
-# libgnunetnat.la \
-# $(top_builddir)/src/lib/util/libgnunetutil.la
-
-#test_nat_mini_SOURCES = \
-#  test_nat_mini.c
-#test_nat_mini_LDADD = \
-# libgnunetnat.la \
-# $(top_builddir)/src/lib/util/libgnunetutil.la
-
-#test_nat_test_SOURCES = \
-#  test_nat_test.c
-#test_nat_test_LDADD = \
-# libgnunetnat.la \
-# $(top_builddir)/src/lib/util/libgnunetutil.la
-
-#test_stun_SOURCES = \
-#  test_stun.c
-#test_stun_LDADD = \
-# libgnunetnat.la \
-# $(top_builddir)/src/lib/util/libgnunetutil.la
-
-EXTRA_DIST = \
- test_nat_data.conf \
- test_nat_test_data.conf \
- test_stun.conf
diff --git a/src/service/nse/Makefile.am b/src/service/nse/Makefile.am
@@ -1,85 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfg_DATA = \
-  nse.conf
-
-lib_LTLIBRARIES = libgnunetnse.la
-
-libgnunetnse_la_SOURCES = \
-  nse_api.c nse.h
-libgnunetnse_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL) $(XLIB)
-libgnunetnse_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)   \
-  -version-info 0:0:0
-
-
-libexec_PROGRAMS = \
- gnunet-service-nse
-
-gnunet_service_nse_SOURCES = \
- gnunet-service-nse.c
-gnunet_service_nse_LDADD = \
-  libgnunetnse.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/core/libgnunetcore.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(LIBGCRYPT_LIBS) \
-  -lm -lgcrypt \
-  $(GN_LIBINTL)
-if ENABLE_NSE_HISTOGRAM
-  gnunet_service_nse_LDADD += \
-    $(top_builddir)/src/testbed-logger/libgnunettestbedlogger.la
-endif
-
-
-if HAVE_BENCHMARKS
-  MULTIPEER_TEST = test_nse_multipeer
-endif
-
-check_PROGRAMS = \
-  perf_kdf
-# test_nse_api \
-# $(MULTIPEER_TEST)
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = $(check_PROGRAMS)
-endif
-
-test_nse_api_SOURCES = \
- test_nse_api.c
-test_nse_api_LDADD = \
-  libgnunetnse.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_nse_multipeer_SOURCES = \
- test_nse_multipeer.c
-test_nse_multipeer_LDADD = \
-  libgnunetnse.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/testbed/libgnunettestbed.la \
-  -lm
-
-perf_kdf_SOURCES = \
- perf_kdf.c
-perf_kdf_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LIBGCRYPT_LIBS) \
-  -lgcrypt
-
-EXTRA_DIST = \
-  test_nse.conf \
-  nse_profiler_test.conf
diff --git a/src/service/peerstore/Makefile.am b/src/service/peerstore/Makefile.am
@@ -1,84 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-dist_pkgcfg_DATA = \
-  peerstore.conf
-
-if USE_COVERAGE
-  AM_CFLAGS = -fprofile-arcs -ftest-coverage
-endif
-
-libexec_PROGRAMS = \
- gnunet-service-peerstore
-
-lib_LTLIBRARIES = \
- libgnunetpeerstore.la
-
-gnunet_service_peerstore_SOURCES = \
- gnunet-service-peerstore.c \
- peerstore_common.c peerstore_common.h \
- peerstore.h
-gnunet_service_peerstore_CFLAGS = $(AM_CFLAGS)
-gnunet_service_peerstore_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/hello/libgnunethello.la \
-  $(GN_LIBINTL)
-
-libgnunetpeerstore_la_SOURCES = \
-  peerstore_api.c \
-  peerstore_api_monitor.c \
-  peerstore_common.c
-libgnunetpeerstore_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/hello/libgnunethello.la
-libgnunetpeerstore_la_LDFLAGS = \
-  $(GN_LIBINTL) \
-  $(GN_LIB_LDFLAGS)
-
-#check_PROGRAMS = \
-# test_peerstore_api_store \
-# test_peerstore_api_iterate \
-# test_peerstore_api_watch \
-# perf_peerstore_store
-
-EXTRA_DIST = \
- test_peerstore_api_data.conf
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = $(check_PROGRAMS)
-endif
-
-test_peerstore_api_store_SOURCES = \
- test_peerstore_api_store.c
-test_peerstore_api_store_LDADD = \
-  libgnunetpeerstore.la  \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_peerstore_api_iterate_SOURCES = \
- test_peerstore_api_iterate.c
-test_peerstore_api_iterate_LDADD = \
-  libgnunetpeerstore.la  \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_peerstore_api_watch_SOURCES = \
- test_peerstore_api_watch.c
-test_peerstore_api_watch_LDADD = \
-  libgnunetpeerstore.la  \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-perf_peerstore_store_SOURCES = \
- perf_peerstore_store.c
-perf_peerstore_store_LDADD = \
-  libgnunetpeerstore.la  \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/service/pils/Makefile.am b/src/service/pils/Makefile.am
@@ -1,85 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-plugindir = $(libdir)/gnunet
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfg_DATA = \
-  pils.conf
-
-lib_LTLIBRARIES = libgnunetpils.la
-
-libgnunetpils_la_SOURCES = \
-  pils_api.c pils.h
-libgnunetpils_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL) $(XLIB)
-libgnunetpils_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)   \
-  -version-info 0:0:0
-
-
-libexec_PROGRAMS = \
- gnunet-service-pils
-
-gnunet_service_pils_SOURCES = \
- gnunet-service-pils.c
-gnunet_service_pils_LDADD = \
-  libgnunetpils.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(LIBGCRYPT_LIBS) \
-  -lm -lgcrypt \
-  $(GN_LIBINTL)
-
-
-check_PROGRAMS =
-  #test_pils_api # disable this test - it might have been a non-viable approach
-
-check_SCRIPTS = \
-  test_pils_basic.sh
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = \
-  $(check_PROGRAMS) \
-  $(check_SCRIPTS)
-
-endif
-
-#test_pils_api_SOURCES = \
-# test_pils_api.c
-#test_pils_api_LDADD = \
-#  libgnunetpils.la \
-#  $(top_builddir)/src/lib/testing/libgnunettesting.la \
-#  $(top_builddir)/src/service/testbed/libgnunettestbed.la \
-#  $(top_builddir)/src/service/testbed/libgnunettestingtestbed.la \
-#  $(top_builddir)/src/service/arm/libgnunettestingarm.la \
-#  #$(top_builddir)/src/service/testing/libgnunettesting.la \
-#  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-EXTRA_DIST = \
-  test_pils_basic.conf \
-  test_pils_basic_topo.conf
-
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_testing_pils_basic.la
-
-libgnunet_plugin_testing_pils_basic_la_SOURCES = \
- test_pils_plugin_basic.c
-libgnunet_plugin_testing_pils_basic_la_LIBADD = \
-  $(top_builddir)/src/service/arm/libgnunettestingarm.la \
-  $(top_builddir)/src/lib/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/service/testbed/libgnunettestingtestbed.la \
-  libgnunetpils.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
diff --git a/src/service/pt/Makefile.am b/src/service/pt/Makefile.am
@@ -1,93 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-plugindir = $(libdir)/gnunet
-
-dist_pkgcfg_DATA = \
-  pt.conf
-
-libexec_PROGRAMS = \
-  gnunet-daemon-pt
-
-gnunet_daemon_pt_SOURCES = \
- gnunet-daemon-pt.c
-gnunet_daemon_pt_LDADD = \
-  $(top_builddir)/src/service/vpn/libgnunetvpn.la \
-  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/service/dht/libgnunetdht.la \
-  $(top_builddir)/src/service/dns/libgnunetdns.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-if LINUX
- VPN_TEST = \
- test_gnunet_vpn-4_to_6 \
- test_gnunet_vpn-6_to_4 \
- test_gnunet_vpn-6_over \
- test_gnunet_vpn-4_over \
- test_gns_vpn
-endif
-
-# check_PROGRAMS = $(VPN_TEST)
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = $(check_PROGRAMS)
-endif
-
-EXTRA_DIST = \
- test_gnunet_vpn.conf \
- test_gns_vpn.conf
-
-
-
-test_gns_vpn_SOURCES = \
- test_gns_vpn.c
-test_gns_vpn_LDADD = $(MHD_LIBS) @LIBCURL@ \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-test_gns_vpn_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
-
-test_gnunet_vpn_4_over_SOURCES = \
- test_gnunet_vpn.c
-test_gnunet_vpn_4_over_LDADD = $(MHD_LIBS) @LIBCURL@ \
- $(top_builddir)/src/service/vpn/libgnunetvpn.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-test_gnunet_vpn_4_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
-
-test_gnunet_vpn_6_over_SOURCES = \
- test_gnunet_vpn.c
-test_gnunet_vpn_6_over_LDADD = $(MHD_LIBS) @LIBCURL@ \
- $(top_builddir)/src/service/vpn/libgnunetvpn.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-test_gnunet_vpn_6_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
-
-test_gnunet_vpn_4_to_6_SOURCES = \
- test_gnunet_vpn.c
-test_gnunet_vpn_4_to_6_LDADD = $(MHD_LIBS) @LIBCURL@ \
- $(top_builddir)/src/service/vpn/libgnunetvpn.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-test_gnunet_vpn_4_to_6_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
-
-test_gnunet_vpn_6_to_4_SOURCES = \
- test_gnunet_vpn.c
-test_gnunet_vpn_6_to_4_LDADD = $(MHD_LIBS) @LIBCURL@ \
- $(top_builddir)/src/service/vpn/libgnunetvpn.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-test_gnunet_vpn_6_to_4_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
diff --git a/src/service/reclaim/Makefile.am b/src/service/reclaim/Makefile.am
@@ -1,102 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
- plugindir = $(libdir)/gnunet
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-
-EXTRA_DIST = \
-  reclaim.conf
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfg_DATA = \
-  reclaim.conf
-
-lib_LTLIBRARIES = \
-  libgnunetreclaim.la \
-  libgnunetdid.la
-
-libexec_PROGRAMS = \
- gnunet-service-reclaim
-
-gnunet_service_reclaim_SOURCES = \
- gnunet-service-reclaim.c \
- gnunet-service-reclaim_tickets.c \
- gnunet-service-reclaim_tickets.h
-gnunet_service_reclaim_LDADD = \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
- libgnunetreclaim.la \
- $(top_builddir)/src/service/gns/libgnunetgns.la \
- $(GN_LIBINTL)
-
-libgnunetreclaim_la_SOURCES = \
- reclaim_api.c \
- reclaim.h \
- reclaim_attribute.c \
- reclaim_attribute.h \
- reclaim_credential.c \
- reclaim_credential.h
-libgnunetreclaim_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(GN_LIBINTL) $(XLIB)
-libgnunetreclaim_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)   \
-  -version-info 0:0:0
-
-libgnunetdid_la_SOURCES = \
-  did_helper.c \
-  did_helper.h \
-  did_core.h \
-  did_core.c
-libgnunetdid_la_LIBADD = \
-	$(top_builddir)/src/lib/util/libgnunetutil.la \
-	$(top_builddir)/src/service/gns/libgnunetgns.la \
-	$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-	$(top_builddir)/src/service/identity/libgnunetidentity.la \
-	$(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-	-ljansson \
-  $(GN_LIBINTL) $(XLIB)
-libgnunetdid_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)   \
-  -version-info 0:0:0
-
-test_reclaim_attribute_SOURCES = \
-  test_reclaim_attribute.c
-test_reclaim_attribute_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  libgnunetreclaim.la \
-  $(GN_LIBINTL)
-
-test_did_helper_SOURCES = \
-  test_did_helper.c
-test_did_helper_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-	$(top_builddir)/src/service/gns/libgnunetgns.la \
-	$(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-	$(top_builddir)/src/service/identity/libgnunetidentity.la \
-	$(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  libgnunetdid.la \
-  -ljansson
-
-check_PROGRAMS = \
-  test_reclaim_attribute \
-  test_did_helper
-
-if ENABLE_TEST_RUN
- AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
- TESTS = \
-  $(check_SCRIPTS) \
-  $(check_PROGRAMS)
-endif
diff --git a/src/service/regex/Makefile.am b/src/service/regex/Makefile.am
@@ -1,148 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-plugindir = $(libdir)/gnunet
-
-pkgcfg_DATA = \
-  regex.conf
-
-libexec_PROGRAMS = \
-  gnunet-service-regex \
-  gnunet-daemon-regexprofiler
-
-REGEX_INTERNAL = \
-  regex_internal_lib.h \
-  regex_internal.h regex_internal.c \
-  regex_internal_dht.c
-REGEX_INTERNAL_TEST = \
-  $(REGEX_INTERNAL) \
-  regex_test_lib.c regex_test_lib.h \
-  regex_test_graph.c \
-  regex_test_random.c
-
-gnunet_service_regex_SOURCES =  \
- $(REGEX_INTERNAL) gnunet-service-regex.c
-gnunet_service_regex_LDADD =  -lm \
- $(top_builddir)/src/plugin/regex/libgnunetregexblock.la \
- $(top_builddir)/src/service/dht/libgnunetdht.la \
- $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(GN_LIBINTL)
-
-lib_LTLIBRARIES = \
-  libgnunetregex.la
-
-libgnunetregex_la_SOURCES = \
-  regex_api_announce.c \
-  regex_api_search.c \
-  regex.c \
-  regex_ipc.h
-libgnunetregex_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-libgnunetregex_la_LDFLAGS = \
-  $(GN_LIBINTL) \
-  $(GN_LIB_LDFLAGS) \
-   -version-info 3:1:0
-
-
-noinst_PROGRAMS = $(noinst_mysql_progs) \
-  perf-regex
-
-perf_regex_SOURCES = \
-  $(REGEX_INTERNAL_TEST) perf-regex.c
-perf_regex_LDADD = -lm \
-  $(top_builddir)/src/service/dht/libgnunetdht.la \
-  $(top_builddir)/src/plugin/regex/libgnunetregexblock.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la
-perf_regex_LDFLAGS = \
-  $(GN_LIBINTL)
-
-gnunet_daemon_regexprofiler_SOURCES = \
-  $(REGEX_INTERNAL_TEST) gnunet-daemon-regexprofiler.c
-gnunet_daemon_regexprofiler_LDADD = -lm \
-  $(top_builddir)/src/service/dht/libgnunetdht.la \
-  $(top_builddir)/src/plugin/regex/libgnunetregexblock.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_daemon_regexprofiler_LDFLAGS = \
-  $(GN_LIBINTL)
-
-check_PROGRAMS = \
-  test_regex
-#  test_regex_integration \
-#  test_regex_eval_api \
-#  test_regex_iterate_api \
-#  test_regex_proofs \
-#  test_regex_graph_api \
-#  test_regex_api
-
-if ENABLE_TEST_RUN
- AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
- TESTS = $(check_PROGRAMS)
-endif
-
-test_regex_SOURCES = \
- test_regex.c
-test_regex_LDADD = \
- libgnunetregex.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-
-test_regex_eval_api_SOURCES = \
-  $(REGEX_INTERNAL_TEST) test_regex_eval_api.c
-test_regex_eval_api_LDADD = -lm \
-  $(top_builddir)/src/service/dht/libgnunetdht.la \
-  $(top_builddir)/src/plugin/regex/libgnunetregexblock.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_regex_integration_SOURCES = \
-  test_regex_integration.c
-test_regex_integration_LDADD = -lm \
-  libgnunetregex.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_regex_api_SOURCES = \
-  test_regex_api.c
-test_regex_api_LDADD = -lm \
-  libgnunetregex.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_regex_iterate_api_SOURCES = \
-  $(REGEX_INTERNAL) test_regex_iterate_api.c
-test_regex_iterate_api_LDADD = -lm \
-  $(top_builddir)/src/plugin/regex/libgnunetregexblock.la \
-  $(top_builddir)/src/service/dht/libgnunetdht.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_regex_proofs_SOURCES = \
-  $(REGEX_INTERNAL_TEST) test_regex_proofs.c
-test_regex_proofs_LDADD = -lm \
-  $(top_builddir)/src/service/dht/libgnunetdht.la \
-  $(top_builddir)/src/plugin/regex/libgnunetregexblock.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_regex_graph_api_SOURCES = \
-  $(REGEX_INTERNAL_TEST) test_regex_graph_api.c
-test_regex_graph_api_LDADD = -lm \
-  $(top_builddir)/src/service/dht/libgnunetdht.la \
-  $(top_builddir)/src/plugin/regex/libgnunetregexblock.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-
-EXTRA_DIST = \
-  test_regex_api_data.conf
diff --git a/src/service/rest/Makefile.am b/src/service/rest/Makefile.am
@@ -1,75 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfg_DATA = \
-   rest.conf
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIBS = -lgcov
-endif
-
-lib_LTLIBRARIES = \
-  libgnunetrest.la 
-
-libexec_PROGRAMS = \
-  gnunet-rest-server
-
-EXTRA_DIST = \
- rest.conf
-
-if HAVE_JOSE
-OPENID_PLUGIN = \
- openid_plugin.c \
- openid_plugin.h \
- oidc_helper.c \
- oidc_helper.h
-OPENID_JOSE_LIBS = -ljose
-endif
-
-gnunet_rest_server_SOURCES = \
- gnunet-rest-server.c \
- config_plugin.c \
- config_plugin.h \
- copying_plugin.c \
- copying_plugin.h \
- identity_plugin.c \
- identity_plugin.h \
- namestore_plugin.c \
- namestore_plugin.h \
- gns_plugin.c \
- gns_plugin.h \
- $(OPENID_PLUGIN) \
- reclaim_plugin.c json_reclaim.c \
- reclaim_plugin.h json_reclaim.h
-gnunet_rest_server_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/json/libgnunetjson.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecordjson.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/service/gns/libgnunetgns.la \
-  $(top_builddir)/src/service/reclaim/libgnunetreclaim.la \
-  libgnunetrest.la \
-	$(OPENID_JOSE_LIBS) \
-	-ljansson \
-	$(LIBGCRYPT_LIBS) \
-  $(GN_LIBINTL) $(MHD_LIBS)
-gnunet_rest_server_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
-
-libgnunetrest_la_SOURCES = \
-  rest.c
-libgnunetrest_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIB) \
-  $(GN_LIBINTL) $(MHD_LIBS)
-libgnunetrest_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS) \
-  -version-info 0:0:0
-libgnunetrest_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
diff --git a/src/service/revocation/Makefile.am b/src/service/revocation/Makefile.am
@@ -1,74 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfg_DATA = \
-  revocation.conf
-
-test_revocation_lsd0001testvectors_SOURCES = \
- test_revocation_testvectors.c
-test_revocation_lsd0001testvectors_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-	$(top_builddir)/src/service/identity/libgnunetidentity.la \
-  libgnunetrevocation.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-lib_LTLIBRARIES = libgnunetrevocation.la
-
-libgnunetrevocation_la_SOURCES = \
-  revocation_api.c revocation.h
-libgnunetrevocation_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(LIBGCRYPT_LIBS) \
-  $(GN_LIBINTL) $(XLIB) -lgcrypt
-libgnunetrevocation_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)   \
-  -version-info 0:0:0
-
-libexec_PROGRAMS = \
- gnunet-service-revocation
-
-gnunet_service_revocation_SOURCES = \
- gnunet-service-revocation.c
-gnunet_service_revocation_LDADD = \
-  libgnunetrevocation.la \
-  $(top_builddir)/src/service/core/libgnunetcore.la \
-  $(top_builddir)/src/service/setu/libgnunetsetu.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la  \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  -lm \
-  $(GN_LIBINTL)
-
-test_revocation_SOURCES = \
- test_revocation.c
-test_revocation_LDADD = \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- libgnunetrevocation.la \
- $(top_builddir)/src//core/libgnunetcore.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/testbed/libgnunettestbed.la
-
-check_PROGRAMS = \
- #test_revocation \
- #test_revocation_lsd0001testvectors
-
-if ENABLE_TEST_RUN
- AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
- TESTS = \
- $(check_SCRIPTS) \
- $(check_PROGRAMS)
-endif
-
-EXTRA_DIST = test_revocation.conf
diff --git a/src/service/seti/Makefile.am b/src/service/seti/Makefile.am
@@ -1,59 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-plugindir = $(libdir)/gnunet
-
-pkgcfg_DATA = \
-  seti.conf
-
-if USE_COVERAGE
-  AM_CFLAGS = -fprofile-arcs -ftest-coverage
-endif
-
-libexec_PROGRAMS = \
- gnunet-service-seti
-
-lib_LTLIBRARIES = \
-  libgnunetseti.la
-
-gnunet_service_seti_SOURCES = \
- gnunet-service-seti.c \
- gnunet-service-seti_protocol.h
-gnunet_service_seti_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/service/core/libgnunetcore.la \
-  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/lib/block/libgnunetblock.la \
-  libgnunetseti.la \
-  $(GN_LIBINTL)
-
-libgnunetseti_la_SOURCES = \
-  seti_api.c seti.h
-libgnunetseti_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunetseti_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)
-
-check_PROGRAMS = \
- # test_seti_api
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = $(check_PROGRAMS)
-endif
-
-test_seti_api_SOURCES = \
- test_seti_api.c
-test_seti_api_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  libgnunetseti.la
-
-EXTRA_DIST = \
-  test_seti.conf
diff --git a/src/service/setu/Makefile.am b/src/service/setu/Makefile.am
@@ -1,81 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-plugindir = $(libdir)/gnunet
-
-pkgcfg_DATA = \
-  setu.conf
-
-if USE_COVERAGE
-  AM_CFLAGS = -fprofile-arcs -ftest-coverage
-endif
-
-noinst_PROGRAMS = \
- gnunet-setu-ibf-profiler
-
-libexec_PROGRAMS = \
- gnunet-service-setu
-
-lib_LTLIBRARIES = \
-  libgnunetsetu.la
-
-gnunet_setu_ibf_profiler_SOURCES = \
- gnunet-setu-ibf-profiler.c \
- ibf.c
-gnunet_setu_ibf_profiler_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-gnunet_service_setu_SOURCES = \
- gnunet-service-setu.c gnunet-service-setu_protocol.h \
- ibf.c ibf.h \
- gnunet-service-setu_strata_estimator.c gnunet-service-setu_strata_estimator.h \
- gnunet-service-setu_protocol.h
-gnunet_service_setu_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/service/core/libgnunetcore.la \
-  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/lib/block/libgnunetblock.la \
-  libgnunetsetu.la \
-  $(GN_LIBINTL)
-
-libgnunetsetu_la_SOURCES = \
-  setu_api.c setu.h
-libgnunetsetu_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunetsetu_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)
-
-check_PROGRAMS = \
- # test_setu_api \
- # perf_setu_api
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = $(check_PROGRAMS)
-endif
-
-test_setu_api_SOURCES = \
- test_setu_api.c
-test_setu_api_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  libgnunetsetu.la
-
-
-perf_setu_api_SOURCES = \
- perf_setu_api.c
-perf_setu_api_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  libgnunetsetu.la
-
-
-EXTRA_DIST = \
-  test_setu.conf
diff --git a/src/service/statistics/Makefile.am b/src/service/statistics/Makefile.am
@@ -1,88 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfg_DATA = \
-  statistics.conf
-
-lib_LTLIBRARIES = libgnunetstatistics.la
-
-libgnunetstatistics_la_SOURCES = \
-  statistics_api.c statistics.h
-libgnunetstatistics_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL) $(XLIB)
-libgnunetstatistics_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)   \
-  -version-info 2:0:0
-
-libexec_PROGRAMS = \
- gnunet-service-statistics
-
-gnunet_service_statistics_SOURCES = \
- gnunet-service-statistics.c
-gnunet_service_statistics_LDADD = \
-  libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-check_PROGRAMS = \
- test_statistics_api \
- test_statistics_api_loop \
- test_statistics_api_watch \
- test_statistics_api_watch_zero_value
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
-endif
-
-test_statistics_api_SOURCES = \
- test_statistics_api.c
-test_statistics_api_LDADD = \
-  libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_statistics_api_loop_SOURCES = \
- test_statistics_api_loop.c
-test_statistics_api_loop_LDADD = \
-  libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_statistics_api_watch_SOURCES = \
- test_statistics_api_watch.c
-test_statistics_api_watch_LDADD = \
-  libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_statistics_api_watch_zero_value_SOURCES = \
- test_statistics_api_watch_zero_value.c
-test_statistics_api_watch_zero_value_LDADD = \
-  libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-# Needs to be done with CLI
-#if HAVE_PYTHON
-#check_SCRIPTS = \
-#  test_gnunet_statistics.py
-#endif
-#
-#SUFFIXES = .py.in .py
-#.py.in.py:
-#	$(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/scripts/dosubst.awk < $(srcdir)/$< > $@
-#	chmod +x $@
-#
-#test_gnunet_statistics.py: test_gnunet_statistics.py.in Makefile
-#	$(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/scripts/dosubst.awk < $(srcdir)/test_gnunet_statistics.py.in > test_gnunet_statistics.py
-#	chmod +x test_gnunet_statistics.py
-#
-EXTRA_DIST = \
-  test_statistics_api_data.conf
diff --git a/src/service/testbed/Makefile.am b/src/service/testbed/Makefile.am
@@ -1,53 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-lib_LTLIBRARIES = \
-  libgnunettestbed.la \
-  libgnunettestingtestbed.la
-
-libgnunettestbed_la_SOURCES = \
-  testbed.c
-libgnunettestbed_la_LIBADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-libgnunettestingtestbed_la_SOURCES = \
-  testbed_api_cmd_system_create.c \
-  testing_testbed_traits.c
-libgnunettestingtestbed_la_LIBADD = \
-  libgnunettestbed.la \
-  $(top_builddir)/src/lib/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-
-bin_PROGRAMS = \
- gnunet-testbed
-
-gnunet_testbed_SOURCES = \
- gnunet-testbed.c
-gnunet_testbed_LDADD = \
- libgnunettestbed.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(GN_LIBINTL)
-
-check_PROGRAMS = \
- test_testbed_portreservation
-
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-# TESTS = \
-#  test_testbed_portreservation
-
-test_testbed_portreservation_SOURCES = \
- test_testbed_portreservation.c
-test_testbed_portreservation_LDADD = \
- libgnunettestbed.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/service/topology/Makefile.am b/src/service/topology/Makefile.am
@@ -1,47 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-dist_pkgcfg_DATA = \
-  topology.conf
-
-
-libexec_PROGRAMS = \
- gnunet-daemon-topology
-
-gnunet_daemon_topology_SOURCES = \
- gnunet-daemon-topology.c
-gnunet_daemon_topology_LDADD = \
-  $(top_builddir)/src/service/core/libgnunetcore.la \
-  $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/service/transport/libgnunettransportapplication.la \
-  $(top_builddir)/src/lib/hello/libgnunethello.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-
-#check_PROGRAMS = \
-# test_gnunet_daemon_topology
-
-# if ENABLE_TEST_RUN
-# AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-# TESTS = $(check_PROGRAMS)
-# endif
-
-test_gnunet_daemon_topology_SOURCES = \
- test_gnunet_daemon_topology.c
-test_gnunet_daemon_topology_LDADD = \
- $(top_builddir)/src/testbed/libgnunettestbed.la \
- $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-EXTRA_DIST = \
- test_gnunet_daemon_topology_data.conf
diff --git a/src/service/transport/Makefile.am b/src/service/transport/Makefile.am
@@ -1,421 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfg_DATA = \
-  transport.conf
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-endif
-
-noinst_PROGRAMS = \
- gnunet-communicator-udp
-
-TESTING_LIBS = \
-  libgnunettestingtransport.la
-
-lib_LTLIBRARIES = \
-  libgnunettransportapplication.la \
-  libgnunettransportcore.la \
-  libgnunettransportcommunicator.la \
-  libgnunettransportmonitor.la \
-  $(TESTING_LIBS)
-
-libgnunet_plugin_testing_transport_simple_send_la_SOURCES = \
-  plugin_testing_transport_simple_send.c
-libgnunet_plugin_testing_transport_simple_send_la_LIBADD = \
-  libgnunettestingtransport.la \
-  $(top_builddir)/src/service/arm/libgnunettestingarm.la \
-  $(top_builddir)/src/lib/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/service/testbed/libgnunettestingtestbed.la \
-  $(top_builddir)/src/service/arm/libgnunetarm.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-
-libgnunettestingtransport_la_SOURCES = \
-  testing_transport_traits.c transport-testing-cmds.h \
-  transport-testing-communicator.c transport-testing-communicator.h \
-  transport-testing2.h \
-  testing_cmd_transport_send_simple.c
-#  testing_cmd_transport_connect_peers.c \
-#  transport_api_cmd_backchannel_check.c \
-#  transport_api_cmd_send_simple_performance.c \
-#  transport-testing-cmds.h \
-#  transport-testing-filenames2.c \
-#  transport-testing-loggers2.c \
-#  transport-testing-main2.c \
-#  transport-testing-send2.c 
-libgnunettestingtransport_la_LIBADD = \
-  libgnunettransportapplication.la \
-  libgnunettransportcore.la \
-  $(top_builddir)/src/service/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/service/arm/libgnunetarm.la \
-  $(top_builddir)/src/lib/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/testbed/libgnunettestbed.la \
-  $(top_builddir)/src/service/testbed/libgnunettestingtestbed.la \
-  $(top_builddir)/src/lib/hello/libgnunethello.la \
-  $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-libgnunettestingtransport_la_LDFLAGS = \
-  $(GN_LIBINTL) \
-  $(GN_LIB_LDFLAGS) \
-  -version-info 0:0:0
-
-libgnunettransportapplication_la_SOURCES = \
-  transport_api_application.c
-libgnunettransportapplication_la_LIBADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(LTLIBINTL)
-libgnunettransportapplication_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 0:0:0
-
-
-libgnunettransportcore_la_SOURCES = \
-  transport_api_core.c
-libgnunettransportcore_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-libgnunettransportcore_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 0:0:0
-
-libgnunettransportcommunicator_la_SOURCES = \
-  transport_api_communication.c
-libgnunettransportcommunicator_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-libgnunettransportcommunicator_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 0:0:0
-
-
-libgnunettransportmonitor_la_SOURCES = \
-  transport_api_monitor.c
-libgnunettransportmonitor_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-libgnunettransportmonitor_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 0:0:0
-
-
-libexec_PROGRAMS = \
- gnunet-service-transport \
- gnunet-communicator-unix \
- gnunet-communicator-udp \
- gnunet-communicator-tcp
-if HAVE_EXPERIMENTAL
-if HAVE_QUICHE
-libexec_PROGRAMS += \
- gnunet-communicator-quic
-endif
-endif
-if HAVE_NGHTTP
-libexec_PROGRAMS += \
- gnunet-communicator-http3
-endif
-
-
-#bin_PROGRAMS = \
-# gnunet-transport
-
-bin_SCRIPTS = \
- gnunet-transport-certificate-creation
-
-# See: https://www.gnu.org/software/automake/manual/html_node/Scripts.html#Scripts
-do_subst = sed -e 's,[@]pkgdatadir[@],$(pkgdatadir),g'
-
-
-gnunet-transport-certificate-creation: gnunet-transport-certificate-creation.in Makefile
-	$(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/scripts/dosubst.awk < $(srcdir)/gnunet-transport-certificate-creation.in > gnunet-transport-certificate-creation
-	@chmod +x gnunet-transport-certificate-creation
-
-
-
-
-gnunet_communicator_unix_SOURCES = \
- gnunet-communicator-unix.c
-gnunet_communicator_unix_LDADD = \
-  libgnunettransportcommunicator.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-gnunet_communicator_tcp_SOURCES = \
- gnunet-communicator-tcp.c
-gnunet_communicator_tcp_LDADD = \
-  libgnunettransportcommunicator.la \
-  $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
-  $(top_builddir)/src/service/nat/libgnunetnatnew.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/hello/libgnunethello.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LIBGCRYPT_LIBS)
-
-gnunet_communicator_udp_SOURCES = \
- gnunet-communicator-udp.c
-gnunet_communicator_udp_LDADD = \
-  libgnunettransportapplication.la \
-  libgnunettransportcommunicator.la \
-  $(top_builddir)/src/service/nat/libgnunetnatnew.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LIBGCRYPT_LIBS)
-
-if HAVE_EXPERIMENTAL
-if HAVE_QUICHE
-gnunet_communicator_quic_SOURCES = \
-  gnunet-communicator-quic.c
-gnunet_communicator_quic_LDADD = \
-  libgnunettransportapplication.la \
-  libgnunettransportcommunicator.la \
-  $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
-  $(top_builddir)/src/service/nat/libgnunetnatnew.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  -lquiche \
-  $(LIBGCRYPT_LIBS)
-endif
-endif
-
-if HAVE_NGHTTP
-gnunet_communicator_http3_SOURCES = \
- gnunet-communicator-http3.c
-gnunet_communicator_http3_CFLAGS = \
-  $(NGHTTP_CFLAGS) $(NGTCP_CFLAGS) $(NGTCP_CRYPTO_CFLAGS)
-gnunet_communicator_http3_LDADD = \
-  libgnunettransportapplication.la \
-  libgnunettransportcommunicator.la \
-  $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
-  $(top_builddir)/src/service/nat/libgnunetnatnew.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(NGTCP_LIBS) \
-  $(NGTCP_CRYPTO_LIBS) \
-  $(NGHTTP_LIBS) \
-  $(LIBGCRYPT_LIBS) \
-  -lgnutls
-endif
-
-#gnunet_transport_SOURCES = \
-# gnunet-transport.c
-#gnunet_transport_LDADD = \
-#  libgnunettransport.la \
-#  $(top_builddir)/src/lib/hello/libgnunethello.la \
-#  $(top_builddir)/src/lib/util/libgnunetutil.la \
-#  $(GN_LIBINTL)
-
-gnunet_service_transport_SOURCES = \
- gnunet-service-transport.c transport.h
-gnunet_service_transport_LDADD = \
-  $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
-  $(top_builddir)/src/lib/hello/libgnunethello.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/service/nat/libgnunetnatnew.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LIBGCRYPT_LIBS) \
-  $(GN_LIBINTL)
-
-plugin_LTLIBRARIES = \
-	libgnunet_plugin_testing_transport_simple_send.la
-
-#libgnunet_test_transport_plugin_cmd_nat_mapping_la_SOURCES = \
-# test_transport_plugin_cmd_nat_mapping.c
-#libgnunet_test_transport_plugin_cmd_nat_mapping_la_LIBADD = \
-#  libgnunettransporttesting2.la \
-#  libgnunettransportapplication.la \
-#  libgnunettransportcore.la \
-#  $(top_builddir)/src/service/testing/libgnunettesting.la \
-#  $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
-#  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-#  $(top_builddir)/src/lib/hello/libgnunethello.la \
-#  $(top_builddir)/src/service/arm/libgnunetarm.la \
-#  $(top_builddir)/src/lib/util/libgnunetutil.la \
-#  $(LTLIBINTL)
-#libgnunet_test_transport_plugin_cmd_nat_mapping_la_LDFLAGS = \
-#  $(GN_PLUGIN_LDFLAGS)
-
-check_PROGRAMS = \
- test_communicator_basic-tcp \
- test_communicator_basic-udp \
- test_communicator_rekey-tcp \
- test_communicator_bidirect-tcp \
- test_communicator_rekey-udp \
- test_communicator_backchannel-udp
-if HAVE_NGHTTP
- check_PROGRAMS += test_communicator_basic-http3
- check_PROGRAMS += test_communicator_bidirect-http3
-endif
-
-if HAVE_EXPERIMENTAL
-check_PROGRAMS += test_communicator_basic-quic \
- test_communicator_basic-unix
-# check_SCRIPTS= \
-  # test_transport_start_testcase.sh \
-  # test_transport_simple_send_performance.sh \
-  # test_transport_nat_icmp_tcp.sh \
-  # test_transport_nat_upnp.sh \
-  # test_transport_simple_send_string.sh \
-  # test_transport_simple_send.sh \
-  # test_transport_simple_send_broadcast.sh \
-  # test_transport_udp_backchannel.sh \
-  # test_transport_simple_send_dv_circle.sh \
-  # test_transport_simple_send_dv_inverse.sh
-endif
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = \
-  $(check_SCRIPTS) \
-  $(check_PROGRAMS)
-endif
-
-
-
-test_communicator_basic_unix_SOURCES = \
- test_communicator_basic.c
-test_communicator_basic_unix_LDADD = \
- libgnunettestingtransport.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/statistics/libgnunetstatistics.la
-
-test_communicator_basic_tcp_SOURCES = \
- test_communicator_basic.c
-test_communicator_basic_tcp_LDADD = \
- libgnunettestingtransport.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/statistics/libgnunetstatistics.la
-
-test_communicator_basic_udp_SOURCES = \
- test_communicator_basic.c
-test_communicator_basic_udp_LDADD = \
- libgnunettestingtransport.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/statistics/libgnunetstatistics.la
-
-test_communicator_basic_quic_SOURCES = \
- test_communicator_basic.c
-test_communicator_basic_quic_LDADD = \
- libgnunettestingtransport.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/statistics/libgnunetstatistics.la
-
-if HAVE_NGHTTP
-test_communicator_basic_http3_SOURCES = \
- test_communicator_basic.c
-test_communicator_basic_http3_LDADD = \
- libgnunettestingtransport.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/statistics/libgnunetstatistics.la
-
-test_communicator_bidirect_http3_SOURCES = \
- test_communicator_basic.c
-test_communicator_bidirect_http3_LDADD = \
- libgnunettestingtransport.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/statistics/libgnunetstatistics.la
-endif
-
-test_communicator_rekey_tcp_SOURCES = \
- test_communicator_basic.c
-test_communicator_rekey_tcp_LDADD = \
- libgnunettestingtransport.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/statistics/libgnunetstatistics.la
-
-test_communicator_rekey_udp_SOURCES = \
- test_communicator_basic.c
-test_communicator_rekey_udp_LDADD = \
- libgnunettestingtransport.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/statistics/libgnunetstatistics.la
-
-test_communicator_backchannel_udp_SOURCES = \
- test_communicator_basic.c
-test_communicator_backchannel_udp_LDADD = \
- libgnunettestingtransport.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/statistics/libgnunetstatistics.la
-
-test_communicator_bidirect_tcp_SOURCES = \
- test_communicator_basic.c
-test_communicator_bidirect_tcp_LDADD = \
- libgnunettestingtransport.la \
- $(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/service/statistics/libgnunetstatistics.la
-
-#test_transport_api_tcp_SOURCES = \
-# test_transport_api.c
-#test_transport_api_tcp_LDADD = \
-# $(top_builddir)/src/lib/hello/libgnunethello.la \
-# $(top_builddir)/src/lib/util/libgnunetutil.la  \
-# libgnunettestingtransport.la
-
-EXTRA_DIST = \
-test_transport_start_testcase.sh \
-test_transport_simple_send_performance.sh \
-test_transport_nat_icmp_tcp.sh \
-test_transport_nat_upnp.sh \
-test_transport_simple_send_string.sh \
-test_transport_simple_send.sh \
-test_transport_simple_send_broadcast.sh \
-test_transport_udp_backchannel.sh \
-test_transport_simple_send_dv_circle.sh \
-test_transport_simple_send_dv_inverse.sh \
-gnunet-transport-certificate-creation.in \
-test_plugin_hostkey \
-test_plugin_hostkey.ecc \
-test_delay \
-template_cfg_peer1.conf\
-template_cfg_peer2.conf\
-test_transport_api_data.conf\
-test_transport_api_multi_peer1.conf\
-test_transport_api_multi_peer2.conf\
-test_transport_api_tcp_nat_peer1.conf\
-test_transport_api_tcp_nat_peer2.conf\
-test_transport_api_tcp_peer1.conf\
-test_transport_api_tcp_peer2.conf\
-test_transport_api_udp_nat_peer1.conf\
-test_transport_api_udp_nat_peer2.conf\
-test_transport_api_udp_peer1.conf\
-test_transport_api_udp_peer2.conf\
-test_transport_api_unix_peer1.conf\
-test_transport_api_unix_peer2.conf\
-test_transport_api_monitor_peers_peer1.conf\
-test_transport_api_monitor_peers_peer2.conf\
-test_transport_api_monitor_validation_peer1.conf\
-test_transport_api_monitor_validation_peer2.conf\
-test_transport_defaults.conf\
-test_communicator_unix_basic_peer1.conf \
-test_communicator_unix_basic_peer2.conf \
-test_communicator_tcp_basic_peer1.conf \
-test_communicator_tcp_basic_peer2.conf \
-test_communicator_udp_basic_peer1.conf \
-test_communicator_http3_basic_peer1.conf \
-test_communicator_http3_basic_peer2.conf \
-test_communicator_udp_basic_peer2.conf \
-test_communicator_tcp_rekey_peer1.conf \
-test_communicator_tcp_rekey_peer2.conf \
-test_communicator_udp_rekey_peer1.conf \
-test_communicator_udp_rekey_peer2.conf \
-test_communicator_udp_backchannel_peer1.conf \
-test_communicator_udp_backchannel_peer2.conf \
-test_communicator_tcp_bidirect_peer1.conf \
-test_communicator_tcp_bidirect_peer2.conf
diff --git a/src/service/util/Makefile.am b/src/service/util/Makefile.am
@@ -1,50 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-pkgcfg_DATA = \
-  resolver.conf
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-libexec_PROGRAMS = \
- gnunet-service-resolver
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
-endif
-
-gnunet_service_resolver_SOURCES = \
- gnunet-service-resolver.c
-gnunet_service_resolver_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-if HAVE_GETADDRINFO_A
-gnunet_service_resolver_LDADD += -lanl
-endif
-
-
-check_PROGRAMS = \
- test_resolver_api.nc
-
-# Declare .nc (NO-CONCURRENCY) as a test extension so that we can impart
-# sequential execution order for them
-TEST_EXTENSIONS = .nc
-test_test_client_unix.log: test_client.log
-
-test_resolver_api_nc_SOURCES = \
- test_resolver_api.c
-test_resolver_api_nc_LDADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-EXTRA_DIST = \
-  test_resolver_api_data.conf
diff --git a/src/service/vpn/Makefile.am b/src/service/vpn/Makefile.am
@@ -1,53 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-plugindir = $(libdir)/gnunet
-
-pkgcfg_DATA = \
-  vpn.conf
-
-if LINUX
-VPNBIN = gnunet-helper-vpn
-endif
-
-
-lib_LTLIBRARIES = \
-  libgnunetvpn.la
-
-
-libexec_PROGRAMS = \
-  $(VPNBIN) \
-  gnunet-service-vpn
-
-gnunet_helper_vpn_SOURCES = \
-  gnunet-helper-vpn.c
-gnunet_helper_vpn_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-gnunet_service_vpn_SOURCES = \
- gnunet-service-vpn.c
-gnunet_service_vpn_LDADD = \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/service/regex/libgnunetregex.la \
-  $(GN_LIBINTL)
-gnunet_service_vpn_CFLAGS = \
-  -I$(top_srcdir)/src/service/exit $(CFLAGS)
-
-libgnunetvpn_la_SOURCES = \
- vpn_api.c vpn.h
-libgnunetvpn_la_LIBADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIB)
-libgnunetvpn_la_LDFLAGS = \
-  $(GN_LIBINTL) \
-  $(GN_LIB_LDFLAGS)
diff --git a/src/service/zonemaster/Makefile.am b/src/service/zonemaster/Makefile.am
@@ -1,32 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfg_DATA = \
-   zonemaster.conf
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIBS = -lgcov
-endif
-
-libexec_PROGRAMS = \
- gnunet-service-zonemaster
-
-gnunet_service_zonemaster_SOURCES = \
- gnunet-service-zonemaster.c
-gnunet_service_zonemaster_LDADD = \
-  $(top_builddir)/src/service/dht/libgnunetdht.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la  \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
-  $(GN_LIBINTL) \
-  -lpthread