diff options
author | Martin Schanzenbach <schanzen@gnunet.org> | 2022-09-06 12:34:39 +0200 |
---|---|---|
committer | Martin Schanzenbach <schanzen@gnunet.org> | 2022-09-06 12:34:39 +0200 |
commit | afea0eea1ecfa41150fdf9ee052acac75eee6534 (patch) | |
tree | 1bb24bac4340262b15640fadbdb7beb8a32f695c /src/transport/Makefile.am | |
parent | 1d4e7a0eec5ee96d878cdd0e4e3c62c0676bf2d0 (diff) | |
download | gnunet-afea0eea1ecfa41150fdf9ee052acac75eee6534.tar.gz gnunet-afea0eea1ecfa41150fdf9ee052acac75eee6534.zip |
BUILD: Remove gnurl. Improve curl-gnutls detection
Diffstat (limited to 'src/transport/Makefile.am')
-rw-r--r-- | src/transport/Makefile.am | 73 |
1 files changed, 19 insertions, 54 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 7bd07b905..a4971ff2c 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -16,63 +16,28 @@ HTTPS_SERVER_PLUGIN_LA = libgnunet_plugin_transport_https_server.la | |||
16 | HTTP_SERVER_PLUGIN_TEST = test_plugin_http_server | 16 | HTTP_SERVER_PLUGIN_TEST = test_plugin_http_server |
17 | HTTPS_SERVER_PLUGIN_TEST = test_plugin_https_server | 17 | HTTPS_SERVER_PLUGIN_TEST = test_plugin_https_server |
18 | 18 | ||
19 | if HAVE_LIBGNURL | 19 | HTTP_CLIENT_PLUGIN_TEST = test_plugin_http_client |
20 | HTTP_CLIENT_PLUGIN_TEST = test_plugin_http_client | 20 | HTTPS_CLIENT_PLUGIN_TEST = test_plugin_https_client |
21 | HTTPS_CLIENT_PLUGIN_TEST = test_plugin_https_client | 21 | HTTP_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_http_client.la |
22 | HTTP_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_http_client.la | 22 | HTTPS_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_https_client.la |
23 | HTTPS_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_https_client.la | 23 | |
24 | LIB_GNURL=@LIBGNURL@ | 24 | HTTP_API_TEST = test_transport_api_http |
25 | CPP_GNURL=@LIBGNURL_CPPFLAGS@ | 25 | HTTP_REVERSE_API_TEST = test_transport_api_http_reverse |
26 | else | 26 | HTTP_API_TIMEOUT_TEST = test_transport_api_timeout_http |
27 | if HAVE_LIBCURL | 27 | HTTP_REL_TEST = test_transport_api_reliability_http \ |
28 | HTTP_CLIENT_PLUGIN_TEST = test_plugin_http_client | ||
29 | HTTPS_CLIENT_PLUGIN_TEST = test_plugin_https_client | ||
30 | HTTP_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_http_client.la | ||
31 | HTTPS_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_https_client.la | ||
32 | LIB_GNURL=@LIBCURL@ | ||
33 | CPP_GNURL=@LIBCURL_CPPFLAGS@ | ||
34 | endif | ||
35 | endif | ||
36 | |||
37 | if HAVE_LIBGNURL | ||
38 | HTTP_API_TEST = test_transport_api_http | ||
39 | HTTP_REVERSE_API_TEST = test_transport_api_http_reverse | ||
40 | HTTP_API_TIMEOUT_TEST = test_transport_api_timeout_http | ||
41 | HTTP_REL_TEST = test_transport_api_reliability_http \ | ||
42 | test_transport_api_reliability_http_xhr | ||
43 | HTTP_QUOTA_TEST = test_quota_compliance_http \ | ||
44 | test_quota_compliance_http_asymmetric | ||
45 | HTTP_SWITCH = test_transport_address_switch_http | ||
46 | HTTPS_API_TEST = test_transport_api_https | ||
47 | HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https | ||
48 | if HAVE_EXPERIMENTAL | ||
49 | HTTPS_REL_TEST = test_transport_api_reliability_https \ | ||
50 | test_transport_api_reliability_https_xhr | ||
51 | endif | ||
52 | HTTPS_QUOTA_TEST = test_quota_compliance_https \ | ||
53 | test_quota_compliance_https_asymmetric | ||
54 | HTTPS_SWITCH = test_transport_address_switch_https | ||
55 | else | ||
56 | if HAVE_LIBCURL | ||
57 | HTTP_API_TEST = test_transport_api_http | ||
58 | HTTP_REVERSE_API_TEST = test_transport_api_http_reverse | ||
59 | HTTP_API_TIMEOUT_TEST = test_transport_api_timeout_http | ||
60 | HTTP_REL_TEST = test_transport_api_reliability_http \ | ||
61 | test_transport_api_reliability_http_xhr | 28 | test_transport_api_reliability_http_xhr |
62 | HTTP_QUOTA_TEST = test_quota_compliance_http \ | 29 | HTTP_QUOTA_TEST = test_quota_compliance_http \ |
63 | test_quota_compliance_http_asymmetric | 30 | test_quota_compliance_http_asymmetric |
64 | HTTP_SWITCH = test_transport_address_switch_http | 31 | HTTP_SWITCH = test_transport_address_switch_http |
65 | HTTPS_API_TEST = test_transport_api_https | 32 | HTTPS_API_TEST = test_transport_api_https |
66 | HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https | 33 | HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https |
67 | if HAVE_EXPERIMENTAL | 34 | if HAVE_EXPERIMENTAL |
68 | HTTPS_REL_TEST = test_transport_api_reliability_https \ | 35 | HTTPS_REL_TEST = test_transport_api_reliability_https \ |
69 | test_transport_api_reliability_https_xhr | 36 | test_transport_api_reliability_https_xhr |
70 | endif | 37 | endif |
71 | HTTPS_QUOTA_TEST = test_quota_compliance_https \ | 38 | HTTPS_QUOTA_TEST = test_quota_compliance_https \ |
72 | test_quota_compliance_https_asymmetric | 39 | test_quota_compliance_https_asymmetric |
73 | HTTPS_SWITCH = test_transport_address_switch_https | 40 | HTTPS_SWITCH = test_transport_address_switch_https |
74 | endif | ||
75 | endif | ||
76 | 41 | ||
77 | if USE_COVERAGE | 42 | if USE_COVERAGE |
78 | AM_CFLAGS = --coverage -O0 | 43 | AM_CFLAGS = --coverage -O0 |
@@ -555,13 +520,13 @@ libgnunet_plugin_transport_http_client_la_LIBADD = \ | |||
555 | $(top_builddir)/src/hello/libgnunethello.la \ | 520 | $(top_builddir)/src/hello/libgnunethello.la \ |
556 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 521 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
557 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ | 522 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ |
558 | $(LIB_GNURL) \ | 523 | @LIBCURL@ \ |
559 | $(top_builddir)/src/util/libgnunetutil.la | 524 | $(top_builddir)/src/util/libgnunetutil.la |
560 | libgnunet_plugin_transport_http_client_la_LDFLAGS = \ | 525 | libgnunet_plugin_transport_http_client_la_LDFLAGS = \ |
561 | $(GN_LIBINTL) \ | 526 | $(GN_LIBINTL) \ |
562 | $(GN_PLUGIN_LDFLAGS) | 527 | $(GN_PLUGIN_LDFLAGS) |
563 | libgnunet_plugin_transport_http_client_la_CFLAGS = \ | 528 | libgnunet_plugin_transport_http_client_la_CFLAGS = \ |
564 | $(CPP_GNURL) $(AM_CFLAGS) | 529 | @LIBCURL_CPPFLAGS@ $(AM_CFLAGS) |
565 | 530 | ||
566 | 531 | ||
567 | libgnunet_plugin_transport_http_server_la_SOURCES = \ | 532 | libgnunet_plugin_transport_http_server_la_SOURCES = \ |
@@ -585,13 +550,13 @@ libgnunet_plugin_transport_https_client_la_LIBADD = \ | |||
585 | $(top_builddir)/src/hello/libgnunethello.la \ | 550 | $(top_builddir)/src/hello/libgnunethello.la \ |
586 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 551 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
587 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ | 552 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ |
588 | $(LIB_GNURL) \ | 553 | @LIBCURL@ \ |
589 | $(top_builddir)/src/util/libgnunetutil.la | 554 | $(top_builddir)/src/util/libgnunetutil.la |
590 | libgnunet_plugin_transport_https_client_la_LDFLAGS = \ | 555 | libgnunet_plugin_transport_https_client_la_LDFLAGS = \ |
591 | $(GN_LIBINTL) \ | 556 | $(GN_LIBINTL) \ |
592 | $(GN_PLUGIN_LDFLAGS) | 557 | $(GN_PLUGIN_LDFLAGS) |
593 | libgnunet_plugin_transport_https_client_la_CFLAGS = \ | 558 | libgnunet_plugin_transport_https_client_la_CFLAGS = \ |
594 | $(CPP_GNURL) $(AM_CFLAGS) -DBUILD_HTTPS | 559 | @LIBCURL_CPPFLAGS@ $(AM_CFLAGS) -DBUILD_HTTPS |
595 | 560 | ||
596 | 561 | ||
597 | libgnunet_plugin_transport_https_server_la_SOURCES = \ | 562 | libgnunet_plugin_transport_https_server_la_SOURCES = \ |