diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2020-05-17 20:02:57 +0200 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2020-05-17 20:02:57 +0200 |
commit | d89a4c1ee6f00924233c799e50777ea985d5b213 (patch) | |
tree | 215610256687d848ab5c0661360763143d6c193f /src | |
parent | 3362a671f77099f9f53cb998a45eec073576391a (diff) | |
download | gnunet-d89a4c1ee6f00924233c799e50777ea985d5b213.tar.gz gnunet-d89a4c1ee6f00924233c799e50777ea985d5b213.zip |
deps are now required, no need for defines
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 22 | ||||
-rw-r--r-- | src/gns/Makefile.am | 12 | ||||
-rw-r--r-- | src/hostlist/Makefile.am | 4 | ||||
-rw-r--r-- | src/hostlist/gnunet-daemon-hostlist.c | 16 | ||||
-rw-r--r-- | src/identity/Makefile.am | 2 | ||||
-rw-r--r-- | src/integration-tests/Makefile.am | 2 | ||||
-rw-r--r-- | src/namestore/Makefile.am | 8 | ||||
-rw-r--r-- | src/peerinfo-tool/Makefile.am | 2 | ||||
-rw-r--r-- | src/pt/Makefile.am | 2 | ||||
-rw-r--r-- | src/reclaim/Makefile.am | 4 | ||||
-rw-r--r-- | src/transport/Makefile.am | 12 |
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 | |||
17 | EXP_DIR += \ | 17 | EXP_DIR += \ |
18 | abe | 18 | abe |
19 | endif | 19 | endif |
20 | if HAVE_JSON | ||
21 | EXP_DIR += \ | 20 | EXP_DIR += \ |
22 | auction | 21 | auction |
23 | endif | 22 | endif |
24 | endif | ||
25 | 23 | ||
26 | if HAVE_JSON | 24 | JSON_DIR = json |
27 | if HAVE_MHD | 25 | CURL_DIR = curl |
28 | JSON_DIR = json | ||
29 | endif | ||
30 | endif | ||
31 | if HAVE_MHD | ||
32 | if HAVE_LIBGNURL | ||
33 | CURL_DIR = curl | ||
34 | else | ||
35 | if HAVE_LIBCURL | ||
36 | CURL_DIR = curl | ||
37 | endif | ||
38 | endif | ||
39 | endif | ||
40 | 26 | ||
41 | if BUILD_PULSE_HELPERS | 27 | if BUILD_PULSE_HELPERS |
42 | CONVERSATION_DIR = conversation | 28 | CONVERSATION_DIR = conversation |
@@ -58,9 +44,7 @@ if HAVE_POSTGRESQL | |||
58 | POSTGRES_DIR = pq | 44 | POSTGRES_DIR = pq |
59 | endif | 45 | endif |
60 | 46 | ||
61 | if HAVE_REST | 47 | REST_DIR = rest |
62 | REST_DIR = rest | ||
63 | endif | ||
64 | 48 | ||
65 | 49 | ||
66 | SUBDIRS = \ | 50 | 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 = \ | |||
55 | libgnunetgns.la | 55 | libgnunetgns.la |
56 | 56 | ||
57 | 57 | ||
58 | if HAVE_MHD | ||
59 | if HAVE_GNUTLS | 58 | if HAVE_GNUTLS |
60 | if HAVE_LIBGNURL | 59 | if HAVE_LIBGNURL |
61 | DO_PROXY=gnunet-gns-proxy | 60 | DO_PROXY=gnunet-gns-proxy |
@@ -69,7 +68,6 @@ CPP_GNURL=@LIBCURL_CPPFLAGS@ | |||
69 | endif | 68 | endif |
70 | endif | 69 | endif |
71 | endif | 70 | endif |
72 | endif | ||
73 | 71 | ||
74 | libexec_PROGRAMS = \ | 72 | libexec_PROGRAMS = \ |
75 | gnunet-service-gns \ | 73 | gnunet-service-gns \ |
@@ -82,15 +80,11 @@ bin_PROGRAMS = \ | |||
82 | noinst_PROGRAMS = \ | 80 | noinst_PROGRAMS = \ |
83 | gnunet-gns-benchmark | 81 | gnunet-gns-benchmark |
84 | 82 | ||
85 | if HAVE_MHD | ||
86 | if LINUX | 83 | if LINUX |
87 | bin_PROGRAMS += gnunet-bcd | 84 | bin_PROGRAMS += gnunet-bcd |
88 | endif | 85 | endif |
89 | endif | ||
90 | 86 | ||
91 | if HAVE_REST | ||
92 | REST_PLUGIN = libgnunet_plugin_rest_gns.la | 87 | REST_PLUGIN = libgnunet_plugin_rest_gns.la |
93 | endif | ||
94 | 88 | ||
95 | plugin_LTLIBRARIES = \ | 89 | plugin_LTLIBRARIES = \ |
96 | libgnunet_plugin_block_gns.la \ | 90 | libgnunet_plugin_block_gns.la \ |
@@ -258,14 +252,12 @@ libgnunet_plugin_block_gns_la_LDFLAGS = \ | |||
258 | $(GN_LIBINTL) \ | 252 | $(GN_LIBINTL) \ |
259 | $(GN_PLUGIN_LDFLAGS) | 253 | $(GN_PLUGIN_LDFLAGS) |
260 | 254 | ||
261 | if HAVE_MHD | ||
262 | if HAVE_GNUTLS | 255 | if HAVE_GNUTLS |
263 | if HAVE_LIBGNURL | 256 | if HAVE_LIBGNURL |
264 | check_PROGRAMS = \ | 257 | check_PROGRAMS = \ |
265 | test_gns_proxy | 258 | test_gns_proxy |
266 | endif | 259 | endif |
267 | endif | 260 | endif |
268 | endif | ||
269 | 261 | ||
270 | check_SCRIPTS = \ | 262 | check_SCRIPTS = \ |
271 | test_gns_lookup.sh \ | 263 | test_gns_lookup.sh \ |
@@ -286,18 +278,14 @@ check_SCRIPTS = \ | |||
286 | test_gns_revocation.sh\ | 278 | test_gns_revocation.sh\ |
287 | test_gns_cname_lookup.sh | 279 | test_gns_cname_lookup.sh |
288 | 280 | ||
289 | if HAVE_MHD | ||
290 | if HAVE_GNUTLS | 281 | if HAVE_GNUTLS |
291 | if HAVE_LIBGNURL | 282 | if HAVE_LIBGNURL |
292 | check_SCRIPTS += \ | 283 | check_SCRIPTS += \ |
293 | test_proxy.sh | 284 | test_proxy.sh |
294 | endif | 285 | endif |
295 | endif | 286 | endif |
296 | if HAVE_JSON | ||
297 | check_SCRIPTS += \ | 287 | check_SCRIPTS += \ |
298 | test_plugin_rest_gns.sh | 288 | test_plugin_rest_gns.sh |
299 | endif | ||
300 | endif | ||
301 | 289 | ||
302 | 290 | ||
303 | if ENABLE_TEST_RUN | 291 | 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 | |||
10 | AM_CFLAGS = --coverage -O0 | 10 | AM_CFLAGS = --coverage -O0 |
11 | endif | 11 | endif |
12 | 12 | ||
13 | if HAVE_MHD | ||
14 | HOSTLIST_SERVER_SOURCES = \ | 13 | HOSTLIST_SERVER_SOURCES = \ |
15 | gnunet-daemon-hostlist_server.c gnunet-daemon-hostlist_server.h | 14 | gnunet-daemon-hostlist_server.c gnunet-daemon-hostlist_server.h |
16 | GN_LIBMHD = $(MHD_LIBS) | 15 | GN_LIBMHD = $(MHD_LIBS) |
17 | GN_CPPMHD = $(MHD_CFLAGS) | 16 | GN_CPPMHD = $(MHD_CFLAGS) |
18 | endif | ||
19 | 17 | ||
20 | if HAVE_LIBGNURL | 18 | if HAVE_LIBGNURL |
21 | libexec_PROGRAMS = \ | 19 | libexec_PROGRAMS = \ |
@@ -70,13 +68,11 @@ check_PROGRAMS = \ | |||
70 | endif | 68 | endif |
71 | endif | 69 | endif |
72 | 70 | ||
73 | if HAVE_MHD | ||
74 | if ENABLE_TEST_RUN | 71 | if ENABLE_TEST_RUN |
75 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | 72 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; |
76 | TESTS = \ | 73 | TESTS = \ |
77 | $(check_PROGRAMS) | 74 | $(check_PROGRAMS) |
78 | endif | 75 | endif |
79 | endif | ||
80 | 76 | ||
81 | test_gnunet_daemon_hostlist_SOURCES = \ | 77 | test_gnunet_daemon_hostlist_SOURCES = \ |
82 | test_gnunet_daemon_hostlist.c | 78 | 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 @@ | |||
30 | #include "gnunet_protocols.h" | 30 | #include "gnunet_protocols.h" |
31 | #include "gnunet_statistics_service.h" | 31 | #include "gnunet_statistics_service.h" |
32 | 32 | ||
33 | #if HAVE_MHD | ||
34 | |||
35 | #include "gnunet-daemon-hostlist_server.h" | 33 | #include "gnunet-daemon-hostlist_server.h" |
36 | 34 | ||
37 | /** | 35 | /** |
@@ -49,8 +47,6 @@ static int provide_hostlist; | |||
49 | */ | 47 | */ |
50 | static GNUNET_CORE_ConnectEventHandler server_ch; | 48 | static GNUNET_CORE_ConnectEventHandler server_ch; |
51 | 49 | ||
52 | #endif | ||
53 | |||
54 | /** | 50 | /** |
55 | * Set if we are allowed to learn about peers by accessing | 51 | * Set if we are allowed to learn about peers by accessing |
56 | * hostlist servers. | 52 | * hostlist servers. |
@@ -211,13 +207,11 @@ connect_handler (void *cls, | |||
211 | (*client_ch)(cls, | 207 | (*client_ch)(cls, |
212 | peer, | 208 | peer, |
213 | mq)); | 209 | mq)); |
214 | #if HAVE_MHD | ||
215 | if (NULL != server_ch) | 210 | if (NULL != server_ch) |
216 | GNUNET_assert (NULL == | 211 | GNUNET_assert (NULL == |
217 | (*server_ch)(cls, | 212 | (*server_ch)(cls, |
218 | peer, | 213 | peer, |
219 | mq)); | 214 | mq)); |
220 | #endif | ||
221 | return (void *) peer; | 215 | return (void *) peer; |
222 | } | 216 | } |
223 | 217 | ||
@@ -265,12 +259,10 @@ cleaning_task (void *cls) | |||
265 | { | 259 | { |
266 | GNUNET_HOSTLIST_client_stop (); | 260 | GNUNET_HOSTLIST_client_stop (); |
267 | } | 261 | } |
268 | #if HAVE_MHD | ||
269 | if (provide_hostlist) | 262 | if (provide_hostlist) |
270 | { | 263 | { |
271 | GNUNET_HOSTLIST_server_stop (); | 264 | GNUNET_HOSTLIST_server_stop (); |
272 | } | 265 | } |
273 | #endif | ||
274 | if (NULL != stats) | 266 | if (NULL != stats) |
275 | { | 267 | { |
276 | GNUNET_STATISTICS_destroy (stats, | 268 | GNUNET_STATISTICS_destroy (stats, |
@@ -306,9 +298,7 @@ run (void *cls, | |||
306 | }; | 298 | }; |
307 | 299 | ||
308 | if ((! bootstrapping) && (! learning) | 300 | if ((! bootstrapping) && (! learning) |
309 | #if HAVE_MHD | ||
310 | && (! provide_hostlist) | 301 | && (! provide_hostlist) |
311 | #endif | ||
312 | ) | 302 | ) |
313 | { | 303 | { |
314 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 304 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
@@ -338,14 +328,12 @@ run (void *cls, | |||
338 | learning ? learn_handlers : no_learn_handlers); | 328 | learning ? learn_handlers : no_learn_handlers); |
339 | 329 | ||
340 | 330 | ||
341 | #if HAVE_MHD | ||
342 | if (provide_hostlist) | 331 | if (provide_hostlist) |
343 | GNUNET_HOSTLIST_server_start (cfg, | 332 | GNUNET_HOSTLIST_server_start (cfg, |
344 | stats, | 333 | stats, |
345 | core, | 334 | core, |
346 | &server_ch, | 335 | &server_ch, |
347 | advertising); | 336 | advertising); |
348 | #endif | ||
349 | GNUNET_SCHEDULER_add_shutdown (&cleaning_task, | 337 | GNUNET_SCHEDULER_add_shutdown (&cleaning_task, |
350 | NULL); | 338 | NULL); |
351 | 339 | ||
@@ -370,13 +358,11 @@ int | |||
370 | main (int argc, char *const *argv) | 358 | main (int argc, char *const *argv) |
371 | { | 359 | { |
372 | struct GNUNET_GETOPT_CommandLineOption options[] = { | 360 | struct GNUNET_GETOPT_CommandLineOption options[] = { |
373 | #if HAVE_MHD | ||
374 | GNUNET_GETOPT_option_flag ('a', | 361 | GNUNET_GETOPT_option_flag ('a', |
375 | "advertise", | 362 | "advertise", |
376 | gettext_noop ( | 363 | gettext_noop ( |
377 | "advertise our hostlist to other peers"), | 364 | "advertise our hostlist to other peers"), |
378 | &advertising), | 365 | &advertising), |
379 | #endif | ||
380 | GNUNET_GETOPT_option_flag ('b', | 366 | GNUNET_GETOPT_option_flag ('b', |
381 | "bootstrap", | 367 | "bootstrap", |
382 | gettext_noop ( | 368 | gettext_noop ( |
@@ -387,12 +373,10 @@ main (int argc, char *const *argv) | |||
387 | gettext_noop ( | 373 | gettext_noop ( |
388 | "enable learning about hostlist servers from other peers"), | 374 | "enable learning about hostlist servers from other peers"), |
389 | &learning), | 375 | &learning), |
390 | #if HAVE_MHD | ||
391 | GNUNET_GETOPT_option_flag ('p', | 376 | GNUNET_GETOPT_option_flag ('p', |
392 | "provide-hostlist", | 377 | "provide-hostlist", |
393 | gettext_noop ("provide a hostlist server"), | 378 | gettext_noop ("provide a hostlist server"), |
394 | &provide_hostlist), | 379 | &provide_hostlist), |
395 | #endif | ||
396 | GNUNET_GETOPT_OPTION_END | 380 | GNUNET_GETOPT_OPTION_END |
397 | }; | 381 | }; |
398 | 382 | ||
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 | |||
8 | XLIB = -lgcov | 8 | XLIB = -lgcov |
9 | endif | 9 | endif |
10 | 10 | ||
11 | if HAVE_REST | ||
12 | plugin_LTLIBRARIES = libgnunet_plugin_rest_identity.la | 11 | plugin_LTLIBRARIES = libgnunet_plugin_rest_identity.la |
13 | endif | ||
14 | 12 | ||
15 | pkgcfgdir= $(pkgdatadir)/config.d/ | 13 | pkgcfgdir= $(pkgdatadir)/config.d/ |
16 | 14 | ||
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 = \ | |||
21 | endif | 21 | endif |
22 | 22 | ||
23 | 23 | ||
24 | if HAVE_MHD | ||
25 | if ENABLE_TEST_RUN | 24 | if ENABLE_TEST_RUN |
26 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | 25 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; |
27 | if HAVE_LIBGNURL | 26 | if HAVE_LIBGNURL |
@@ -34,7 +33,6 @@ TESTS = \ | |||
34 | endif | 33 | endif |
35 | endif | 34 | endif |
36 | endif | 35 | endif |
37 | endif | ||
38 | 36 | ||
39 | SUFFIXES = .py.in .py | 37 | SUFFIXES = .py.in .py |
40 | .py.in.py: | 38 | .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 = \ | |||
99 | $(check_SCRIPTS) | 99 | $(check_SCRIPTS) |
100 | endif | 100 | endif |
101 | 101 | ||
102 | if HAVE_REST | ||
103 | REST_PLUGIN = libgnunet_plugin_rest_namestore.la | 102 | REST_PLUGIN = libgnunet_plugin_rest_namestore.la |
104 | endif | ||
105 | 103 | ||
106 | lib_LTLIBRARIES = \ | 104 | lib_LTLIBRARIES = \ |
107 | libgnunetnamestore.la | 105 | libgnunetnamestore.la |
@@ -114,10 +112,8 @@ bin_PROGRAMS = \ | |||
114 | gnunet-namestore \ | 112 | gnunet-namestore \ |
115 | gnunet-zoneimport | 113 | gnunet-zoneimport |
116 | 114 | ||
117 | if HAVE_MHD | ||
118 | libexec_PROGRAMS += \ | 115 | libexec_PROGRAMS += \ |
119 | gnunet-namestore-fcfsd | 116 | gnunet-namestore-fcfsd |
120 | endif | ||
121 | 117 | ||
122 | 118 | ||
123 | plugin_LTLIBRARIES = \ | 119 | plugin_LTLIBRARIES = \ |
@@ -679,12 +675,8 @@ check_SCRIPTS = \ | |||
679 | test_namestore_lookup.sh \ | 675 | test_namestore_lookup.sh \ |
680 | test_namestore_delete.sh | 676 | test_namestore_delete.sh |
681 | 677 | ||
682 | if HAVE_MHD | ||
683 | if HAVE_JSON | ||
684 | check_SCRIPTS += \ | 678 | check_SCRIPTS += \ |
685 | test_plugin_rest_namestore.sh | 679 | test_plugin_rest_namestore.sh |
686 | endif | ||
687 | endif | ||
688 | 680 | ||
689 | EXTRA_DIST = \ | 681 | EXTRA_DIST = \ |
690 | test_common.c \ | 682 | 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 | |||
6 | XLIB = -lgcov | 6 | XLIB = -lgcov |
7 | endif | 7 | endif |
8 | 8 | ||
9 | if HAVE_REST | ||
10 | REST_PLUGIN = libgnunet_plugin_rest_peerinfo.la | 9 | REST_PLUGIN = libgnunet_plugin_rest_peerinfo.la |
11 | endif | ||
12 | 10 | ||
13 | plugindir = $(libdir)/gnunet | 11 | plugindir = $(libdir)/gnunet |
14 | 12 | ||
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 = \ | |||
29 | $(GN_LIBINTL) | 29 | $(GN_LIBINTL) |
30 | 30 | ||
31 | if HAVE_TESTING | 31 | if HAVE_TESTING |
32 | if HAVE_MHD | ||
33 | 32 | ||
34 | if HAVE_LIBGNURL | 33 | if HAVE_LIBGNURL |
35 | LIB_GNURL=@LIBGNURL@ | 34 | LIB_GNURL=@LIBGNURL@ |
@@ -58,7 +57,6 @@ endif | |||
58 | endif | 57 | endif |
59 | 58 | ||
60 | endif | 59 | endif |
61 | endif | ||
62 | 60 | ||
63 | check_PROGRAMS = $(VPN_TEST) | 61 | check_PROGRAMS = $(VPN_TEST) |
64 | 62 | ||
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 | |||
9 | endif | 9 | endif |
10 | 10 | ||
11 | 11 | ||
12 | if HAVE_REST | ||
13 | REST_PLUGIN = \ | 12 | REST_PLUGIN = \ |
14 | libgnunet_plugin_rest_openid_connect.la \ | 13 | libgnunet_plugin_rest_openid_connect.la \ |
15 | libgnunet_plugin_rest_reclaim.la | 14 | libgnunet_plugin_rest_reclaim.la |
16 | endif | ||
17 | 15 | ||
18 | if HAVE_JSON | ||
19 | ATTESTATION_PLUGIN = \ | 16 | ATTESTATION_PLUGIN = \ |
20 | libgnunet_plugin_reclaim_attestation_jwt.la | 17 | libgnunet_plugin_reclaim_attestation_jwt.la |
21 | endif | ||
22 | 18 | ||
23 | EXTRA_DIST = \ | 19 | EXTRA_DIST = \ |
24 | reclaim.conf \ | 20 | 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 = \ | |||
11 | transport.conf \ | 11 | transport.conf \ |
12 | communicator-unix.conf | 12 | communicator-unix.conf |
13 | 13 | ||
14 | if HAVE_MHD | 14 | HTTP_SERVER_PLUGIN_LA = libgnunet_plugin_transport_http_server.la |
15 | HTTP_SERVER_PLUGIN_LA = libgnunet_plugin_transport_http_server.la | 15 | HTTPS_SERVER_PLUGIN_LA = libgnunet_plugin_transport_https_server.la |
16 | HTTPS_SERVER_PLUGIN_LA = libgnunet_plugin_transport_https_server.la | 16 | HTTP_SERVER_PLUGIN_TEST = test_plugin_http_server |
17 | HTTP_SERVER_PLUGIN_TEST = test_plugin_http_server | 17 | HTTPS_SERVER_PLUGIN_TEST = test_plugin_https_server |
18 | HTTPS_SERVER_PLUGIN_TEST = test_plugin_https_server | ||
19 | endif | ||
20 | 18 | ||
21 | if HAVE_LIBGNURL | 19 | if HAVE_LIBGNURL |
22 | HTTP_CLIENT_PLUGIN_TEST = test_plugin_http_client | 20 | HTTP_CLIENT_PLUGIN_TEST = test_plugin_http_client |
@@ -36,7 +34,6 @@ CPP_GNURL=@LIBCURL_CPPFLAGS@ | |||
36 | endif | 34 | endif |
37 | endif | 35 | endif |
38 | 36 | ||
39 | if HAVE_MHD | ||
40 | if HAVE_LIBGNURL | 37 | if HAVE_LIBGNURL |
41 | HTTP_API_TEST = test_transport_api_http | 38 | HTTP_API_TEST = test_transport_api_http |
42 | HTTP_REVERSE_API_TEST = test_transport_api_http_reverse | 39 | HTTP_REVERSE_API_TEST = test_transport_api_http_reverse |
@@ -76,7 +73,6 @@ endif | |||
76 | HTTPS_SWITCH = test_transport_address_switch_https | 73 | HTTPS_SWITCH = test_transport_address_switch_https |
77 | endif | 74 | endif |
78 | endif | 75 | endif |
79 | endif | ||
80 | 76 | ||
81 | if USE_COVERAGE | 77 | if USE_COVERAGE |
82 | AM_CFLAGS = --coverage -O0 | 78 | AM_CFLAGS = --coverage -O0 |