summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schanzenbach <mschanzenbach@posteo.de>2020-05-17 20:02:57 +0200
committerMartin Schanzenbach <mschanzenbach@posteo.de>2020-05-17 20:02:57 +0200
commitd89a4c1ee6f00924233c799e50777ea985d5b213 (patch)
tree215610256687d848ab5c0661360763143d6c193f
parent3362a671f77099f9f53cb998a45eec073576391a (diff)
deps are now required, no need for defines
-rw-r--r--src/Makefile.am22
-rw-r--r--src/gns/Makefile.am12
-rw-r--r--src/hostlist/Makefile.am4
-rw-r--r--src/hostlist/gnunet-daemon-hostlist.c16
-rw-r--r--src/identity/Makefile.am2
-rw-r--r--src/integration-tests/Makefile.am2
-rw-r--r--src/namestore/Makefile.am8
-rw-r--r--src/peerinfo-tool/Makefile.am2
-rw-r--r--src/pt/Makefile.am2
-rw-r--r--src/reclaim/Makefile.am4
-rw-r--r--src/transport/Makefile.am12
11 files changed, 7 insertions, 79 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 4642b6215..446b1aa2a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,26 +17,12 @@ if HAVE_ABE
EXP_DIR += \
abe
endif
-if HAVE_JSON
EXP_DIR += \
auction
endif
-endif
-if HAVE_JSON
-if HAVE_MHD
- JSON_DIR = json
-endif
-endif
-if HAVE_MHD
-if HAVE_LIBGNURL
- CURL_DIR = curl
-else
-if HAVE_LIBCURL
- CURL_DIR = curl
-endif
-endif
-endif
+JSON_DIR = json
+CURL_DIR = curl
if BUILD_PULSE_HELPERS
CONVERSATION_DIR = conversation
@@ -58,9 +44,7 @@ if HAVE_POSTGRESQL
POSTGRES_DIR = pq
endif
-if HAVE_REST
- REST_DIR = rest
-endif
+REST_DIR = rest
SUBDIRS = \
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 7a5f7cfd8..5a9c70997 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -55,7 +55,6 @@ lib_LTLIBRARIES = \
libgnunetgns.la
-if HAVE_MHD
if HAVE_GNUTLS
if HAVE_LIBGNURL
DO_PROXY=gnunet-gns-proxy
@@ -69,7 +68,6 @@ CPP_GNURL=@LIBCURL_CPPFLAGS@
endif
endif
endif
-endif
libexec_PROGRAMS = \
gnunet-service-gns \
@@ -82,15 +80,11 @@ bin_PROGRAMS = \
noinst_PROGRAMS = \
gnunet-gns-benchmark
-if HAVE_MHD
if LINUX
bin_PROGRAMS += gnunet-bcd
endif
-endif
-if HAVE_REST
REST_PLUGIN = libgnunet_plugin_rest_gns.la
-endif
plugin_LTLIBRARIES = \
libgnunet_plugin_block_gns.la \
@@ -258,14 +252,12 @@ libgnunet_plugin_block_gns_la_LDFLAGS = \
$(GN_LIBINTL) \
$(GN_PLUGIN_LDFLAGS)
-if HAVE_MHD
if HAVE_GNUTLS
if HAVE_LIBGNURL
check_PROGRAMS = \
test_gns_proxy
endif
endif
-endif
check_SCRIPTS = \
test_gns_lookup.sh \
@@ -286,18 +278,14 @@ check_SCRIPTS = \
test_gns_revocation.sh\
test_gns_cname_lookup.sh
-if HAVE_MHD
if HAVE_GNUTLS
if HAVE_LIBGNURL
check_SCRIPTS += \
test_proxy.sh
endif
endif
-if HAVE_JSON
check_SCRIPTS += \
test_plugin_rest_gns.sh
-endif
-endif
if ENABLE_TEST_RUN
diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am
index a8621a2b0..3b534de70 100644
--- a/src/hostlist/Makefile.am
+++ b/src/hostlist/Makefile.am
@@ -10,12 +10,10 @@ if USE_COVERAGE
AM_CFLAGS = --coverage -O0
endif
-if HAVE_MHD
HOSTLIST_SERVER_SOURCES = \
gnunet-daemon-hostlist_server.c gnunet-daemon-hostlist_server.h
GN_LIBMHD = $(MHD_LIBS)
GN_CPPMHD = $(MHD_CFLAGS)
-endif
if HAVE_LIBGNURL
libexec_PROGRAMS = \
@@ -70,13 +68,11 @@ check_PROGRAMS = \
endif
endif
-if HAVE_MHD
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
-endif
test_gnunet_daemon_hostlist_SOURCES = \
test_gnunet_daemon_hostlist.c
diff --git a/src/hostlist/gnunet-daemon-hostlist.c b/src/hostlist/gnunet-daemon-hostlist.c
index 704c796b4..54e070f89 100644
--- a/src/hostlist/gnunet-daemon-hostlist.c
+++ b/src/hostlist/gnunet-daemon-hostlist.c
@@ -30,8 +30,6 @@
#include "gnunet_protocols.h"
#include "gnunet_statistics_service.h"
-#if HAVE_MHD
-
#include "gnunet-daemon-hostlist_server.h"
/**
@@ -49,8 +47,6 @@ static int provide_hostlist;
*/
static GNUNET_CORE_ConnectEventHandler server_ch;
-#endif
-
/**
* Set if we are allowed to learn about peers by accessing
* hostlist servers.
@@ -211,13 +207,11 @@ connect_handler (void *cls,
(*client_ch)(cls,
peer,
mq));
-#if HAVE_MHD
if (NULL != server_ch)
GNUNET_assert (NULL ==
(*server_ch)(cls,
peer,
mq));
-#endif
return (void *) peer;
}
@@ -265,12 +259,10 @@ cleaning_task (void *cls)
{
GNUNET_HOSTLIST_client_stop ();
}
-#if HAVE_MHD
if (provide_hostlist)
{
GNUNET_HOSTLIST_server_stop ();
}
-#endif
if (NULL != stats)
{
GNUNET_STATISTICS_destroy (stats,
@@ -306,9 +298,7 @@ run (void *cls,
};
if ((! bootstrapping) && (! learning)
-#if HAVE_MHD
&& (! provide_hostlist)
-#endif
)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
@@ -338,14 +328,12 @@ run (void *cls,
learning ? learn_handlers : no_learn_handlers);
-#if HAVE_MHD
if (provide_hostlist)
GNUNET_HOSTLIST_server_start (cfg,
stats,
core,
&server_ch,
advertising);
-#endif
GNUNET_SCHEDULER_add_shutdown (&cleaning_task,
NULL);
@@ -370,13 +358,11 @@ int
main (int argc, char *const *argv)
{
struct GNUNET_GETOPT_CommandLineOption options[] = {
-#if HAVE_MHD
GNUNET_GETOPT_option_flag ('a',
"advertise",
gettext_noop (
"advertise our hostlist to other peers"),
&advertising),
-#endif
GNUNET_GETOPT_option_flag ('b',
"bootstrap",
gettext_noop (
@@ -387,12 +373,10 @@ main (int argc, char *const *argv)
gettext_noop (
"enable learning about hostlist servers from other peers"),
&learning),
-#if HAVE_MHD
GNUNET_GETOPT_option_flag ('p',
"provide-hostlist",
gettext_noop ("provide a hostlist server"),
&provide_hostlist),
-#endif
GNUNET_GETOPT_OPTION_END
};
diff --git a/src/identity/Makefile.am b/src/identity/Makefile.am
index 17e72c784..e806f0059 100644
--- a/src/identity/Makefile.am
+++ b/src/identity/Makefile.am
@@ -8,9 +8,7 @@ if USE_COVERAGE
XLIB = -lgcov
endif
-if HAVE_REST
plugin_LTLIBRARIES = libgnunet_plugin_rest_identity.la
-endif
pkgcfgdir= $(pkgdatadir)/config.d/
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index f456544db..b3adc3a0f 100644
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -21,7 +21,6 @@ check_SCRIPTS = \
endif
-if HAVE_MHD
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;
if HAVE_LIBGNURL
@@ -34,7 +33,6 @@ TESTS = \
endif
endif
endif
-endif
SUFFIXES = .py.in .py
.py.in.py:
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index 94861b478..f4b846065 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -99,9 +99,7 @@ TESTS = \
$(check_SCRIPTS)
endif
-if HAVE_REST
REST_PLUGIN = libgnunet_plugin_rest_namestore.la
-endif
lib_LTLIBRARIES = \
libgnunetnamestore.la
@@ -114,10 +112,8 @@ bin_PROGRAMS = \
gnunet-namestore \
gnunet-zoneimport
-if HAVE_MHD
libexec_PROGRAMS += \
gnunet-namestore-fcfsd
-endif
plugin_LTLIBRARIES = \
@@ -679,12 +675,8 @@ check_SCRIPTS = \
test_namestore_lookup.sh \
test_namestore_delete.sh
-if HAVE_MHD
-if HAVE_JSON
check_SCRIPTS += \
test_plugin_rest_namestore.sh
-endif
-endif
EXTRA_DIST = \
test_common.c \
diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am
index 93252570c..dfcdcd3da 100644
--- a/src/peerinfo-tool/Makefile.am
+++ b/src/peerinfo-tool/Makefile.am
@@ -6,9 +6,7 @@ if USE_COVERAGE
XLIB = -lgcov
endif
-if HAVE_REST
REST_PLUGIN = libgnunet_plugin_rest_peerinfo.la
-endif
plugindir = $(libdir)/gnunet
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am
index 09a68b779..10ae04931 100644
--- a/src/pt/Makefile.am
+++ b/src/pt/Makefile.am
@@ -29,7 +29,6 @@ gnunet_daemon_pt_LDADD = \
$(GN_LIBINTL)
if HAVE_TESTING
-if HAVE_MHD
if HAVE_LIBGNURL
LIB_GNURL=@LIBGNURL@
@@ -58,7 +57,6 @@ endif
endif
endif
-endif
check_PROGRAMS = $(VPN_TEST)
diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am
index 6d448cc3c..b6d73bdf7 100644
--- a/src/reclaim/Makefile.am
+++ b/src/reclaim/Makefile.am
@@ -9,16 +9,12 @@ if USE_COVERAGE
endif
-if HAVE_REST
REST_PLUGIN = \
libgnunet_plugin_rest_openid_connect.la \
libgnunet_plugin_rest_reclaim.la
-endif
-if HAVE_JSON
ATTESTATION_PLUGIN = \
libgnunet_plugin_reclaim_attestation_jwt.la
-endif
EXTRA_DIST = \
reclaim.conf \
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 3028b29b4..02e87da0f 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -11,12 +11,10 @@ pkgcfg_DATA = \
transport.conf \
communicator-unix.conf
-if HAVE_MHD
- HTTP_SERVER_PLUGIN_LA = libgnunet_plugin_transport_http_server.la
- HTTPS_SERVER_PLUGIN_LA = libgnunet_plugin_transport_https_server.la
- HTTP_SERVER_PLUGIN_TEST = test_plugin_http_server
- HTTPS_SERVER_PLUGIN_TEST = test_plugin_https_server
-endif
+HTTP_SERVER_PLUGIN_LA = libgnunet_plugin_transport_http_server.la
+HTTPS_SERVER_PLUGIN_LA = libgnunet_plugin_transport_https_server.la
+HTTP_SERVER_PLUGIN_TEST = test_plugin_http_server
+HTTPS_SERVER_PLUGIN_TEST = test_plugin_https_server
if HAVE_LIBGNURL
HTTP_CLIENT_PLUGIN_TEST = test_plugin_http_client
@@ -36,7 +34,6 @@ CPP_GNURL=@LIBCURL_CPPFLAGS@
endif
endif
-if HAVE_MHD
if HAVE_LIBGNURL
HTTP_API_TEST = test_transport_api_http
HTTP_REVERSE_API_TEST = test_transport_api_http_reverse
@@ -76,7 +73,6 @@ endif
HTTPS_SWITCH = test_transport_address_switch_https
endif
endif
-endif
if USE_COVERAGE
AM_CFLAGS = --coverage -O0